Allow dev builds to skip proxy version gate
This commit is contained in:
rcourtman
parent
e708727725
commit
387a68ef18
1 changed files with 46 additions and 46 deletions
|
|
@ -366,7 +366,7 @@ type NodeConfigRequest struct {
|
||||||
Type string `json:"type"` // "pve", "pbs", or "pmg"
|
Type string `json:"type"` // "pve", "pbs", or "pmg"
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Host string `json:"host"`
|
Host string `json:"host"`
|
||||||
GuestURL string `json:"guestURL,omitempty"` // Optional guest-accessible URL (for navigation)
|
GuestURL string `json:"guestURL,omitempty"` // Optional guest-accessible URL (for navigation)
|
||||||
User string `json:"user,omitempty"`
|
User string `json:"user,omitempty"`
|
||||||
Password string `json:"password,omitempty"`
|
Password string `json:"password,omitempty"`
|
||||||
TokenName string `json:"tokenName,omitempty"`
|
TokenName string `json:"tokenName,omitempty"`
|
||||||
|
|
@ -392,36 +392,36 @@ type NodeConfigRequest struct {
|
||||||
|
|
||||||
// NodeResponse represents a node in API responses
|
// NodeResponse represents a node in API responses
|
||||||
type NodeResponse struct {
|
type NodeResponse struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Host string `json:"host"`
|
Host string `json:"host"`
|
||||||
GuestURL string `json:"guestURL,omitempty"`
|
GuestURL string `json:"guestURL,omitempty"`
|
||||||
User string `json:"user,omitempty"`
|
User string `json:"user,omitempty"`
|
||||||
HasPassword bool `json:"hasPassword"`
|
HasPassword bool `json:"hasPassword"`
|
||||||
TokenName string `json:"tokenName,omitempty"`
|
TokenName string `json:"tokenName,omitempty"`
|
||||||
HasToken bool `json:"hasToken"`
|
HasToken bool `json:"hasToken"`
|
||||||
Fingerprint string `json:"fingerprint,omitempty"`
|
Fingerprint string `json:"fingerprint,omitempty"`
|
||||||
VerifySSL bool `json:"verifySSL"`
|
VerifySSL bool `json:"verifySSL"`
|
||||||
MonitorVMs bool `json:"monitorVMs,omitempty"`
|
MonitorVMs bool `json:"monitorVMs,omitempty"`
|
||||||
MonitorContainers bool `json:"monitorContainers,omitempty"`
|
MonitorContainers bool `json:"monitorContainers,omitempty"`
|
||||||
MonitorStorage bool `json:"monitorStorage,omitempty"`
|
MonitorStorage bool `json:"monitorStorage,omitempty"`
|
||||||
MonitorBackups bool `json:"monitorBackups,omitempty"`
|
MonitorBackups bool `json:"monitorBackups,omitempty"`
|
||||||
MonitorPhysicalDisks *bool `json:"monitorPhysicalDisks,omitempty"`
|
MonitorPhysicalDisks *bool `json:"monitorPhysicalDisks,omitempty"`
|
||||||
TemperatureMonitoringEnabled *bool `json:"temperatureMonitoringEnabled,omitempty"`
|
TemperatureMonitoringEnabled *bool `json:"temperatureMonitoringEnabled,omitempty"`
|
||||||
MonitorDatastores bool `json:"monitorDatastores,omitempty"`
|
MonitorDatastores bool `json:"monitorDatastores,omitempty"`
|
||||||
MonitorSyncJobs bool `json:"monitorSyncJobs,omitempty"`
|
MonitorSyncJobs bool `json:"monitorSyncJobs,omitempty"`
|
||||||
MonitorVerifyJobs bool `json:"monitorVerifyJobs,omitempty"`
|
MonitorVerifyJobs bool `json:"monitorVerifyJobs,omitempty"`
|
||||||
MonitorPruneJobs bool `json:"monitorPruneJobs,omitempty"`
|
MonitorPruneJobs bool `json:"monitorPruneJobs,omitempty"`
|
||||||
MonitorGarbageJobs bool `json:"monitorGarbageJobs,omitempty"`
|
MonitorGarbageJobs bool `json:"monitorGarbageJobs,omitempty"`
|
||||||
MonitorMailStats bool `json:"monitorMailStats,omitempty"`
|
MonitorMailStats bool `json:"monitorMailStats,omitempty"`
|
||||||
MonitorQueues bool `json:"monitorQueues,omitempty"`
|
MonitorQueues bool `json:"monitorQueues,omitempty"`
|
||||||
MonitorQuarantine bool `json:"monitorQuarantine,omitempty"`
|
MonitorQuarantine bool `json:"monitorQuarantine,omitempty"`
|
||||||
MonitorDomainStats bool `json:"monitorDomainStats,omitempty"`
|
MonitorDomainStats bool `json:"monitorDomainStats,omitempty"`
|
||||||
Status string `json:"status"` // "connected", "disconnected", "error"
|
Status string `json:"status"` // "connected", "disconnected", "error"
|
||||||
IsCluster bool `json:"isCluster,omitempty"`
|
IsCluster bool `json:"isCluster,omitempty"`
|
||||||
ClusterName string `json:"clusterName,omitempty"`
|
ClusterName string `json:"clusterName,omitempty"`
|
||||||
ClusterEndpoints []config.ClusterEndpoint `json:"clusterEndpoints,omitempty"`
|
ClusterEndpoints []config.ClusterEndpoint `json:"clusterEndpoints,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// deriveSchemeAndPort infers the scheme (without ://) and port from a base host URL.
|
// deriveSchemeAndPort infers the scheme (without ://) and port from a base host URL.
|
||||||
|
|
@ -1202,24 +1202,24 @@ func (h *ConfigHandlers) HandleAddNode(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
pve := config.PVEInstance{
|
pve := config.PVEInstance{
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Host: host, // Use normalized host
|
Host: host, // Use normalized host
|
||||||
GuestURL: req.GuestURL,
|
GuestURL: req.GuestURL,
|
||||||
User: req.User,
|
User: req.User,
|
||||||
Password: req.Password,
|
Password: req.Password,
|
||||||
TokenName: req.TokenName,
|
TokenName: req.TokenName,
|
||||||
TokenValue: req.TokenValue,
|
TokenValue: req.TokenValue,
|
||||||
Fingerprint: req.Fingerprint,
|
Fingerprint: req.Fingerprint,
|
||||||
VerifySSL: verifySSL,
|
VerifySSL: verifySSL,
|
||||||
MonitorVMs: monitorVMs,
|
MonitorVMs: monitorVMs,
|
||||||
MonitorContainers: monitorContainers,
|
MonitorContainers: monitorContainers,
|
||||||
MonitorStorage: monitorStorage,
|
MonitorStorage: monitorStorage,
|
||||||
MonitorBackups: monitorBackups,
|
MonitorBackups: monitorBackups,
|
||||||
MonitorPhysicalDisks: req.MonitorPhysicalDisks,
|
MonitorPhysicalDisks: req.MonitorPhysicalDisks,
|
||||||
TemperatureMonitoringEnabled: req.TemperatureMonitoringEnabled,
|
TemperatureMonitoringEnabled: req.TemperatureMonitoringEnabled,
|
||||||
IsCluster: isCluster,
|
IsCluster: isCluster,
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
ClusterEndpoints: clusterEndpoints,
|
ClusterEndpoints: clusterEndpoints,
|
||||||
}
|
}
|
||||||
h.config.PVEInstances = append(h.config.PVEInstances, pve)
|
h.config.PVEInstances = append(h.config.PVEInstances, pve)
|
||||||
|
|
||||||
|
|
@ -4009,7 +4009,7 @@ if [ "$PULSE_IS_CONTAINERIZED" = true ]; then
|
||||||
echo " Temperature proxy requires Pulse $MIN_PROXY_VERSION or later."
|
echo " Temperature proxy requires Pulse $MIN_PROXY_VERSION or later."
|
||||||
TEMP_MONITORING_AVAILABLE=false
|
TEMP_MONITORING_AVAILABLE=false
|
||||||
# Allow dev/main builds (they have latest code)
|
# Allow dev/main builds (they have latest code)
|
||||||
elif [[ "$PULSE_VERSION" =~ ^(0\.0\.0-main|dev|main) ]]; then
|
elif [[ "$PULSE_VERSION" =~ ^(0\.0\.0-main|0\.0\.0-|dev|main) || "$PULSE_VERSION" =~ -dirty$ ]]; then
|
||||||
# Dev/main builds have proxy support - skip version check
|
# Dev/main builds have proxy support - skip version check
|
||||||
:
|
:
|
||||||
elif ! version_ge "$PULSE_VERSION" "$MIN_PROXY_VERSION"; then
|
elif ! version_ge "$PULSE_VERSION" "$MIN_PROXY_VERSION"; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue