controllers: adds healthCheck scheme based on extraArgs tls param

it should help to build correct ready checks with enabld TLS at extra args
VictoriaMetrics · Aug 16, 2022 · e43a4d5 · e43a4d5
1 parent b9fb074
commit e43a4d5
Show file tree

Hide file tree

Showing 20 changed files with 421 additions and 115 deletions.
diff --git a/api/v1beta1/vmagent_types.go b/api/v1beta1/vmagent_types.go
@@ -612,6 +612,27 @@ func (cr *VMAgent) AsCRDOwner() []metav1.OwnerReference {
 	return GetCRDAsOwner(Agent)
 }
 
+func (cr *VMAgent) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAgent) ProbePath() string {
+
+	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
+}
+
+func (cr *VMAgent) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr VMAgent) ProbePort() string {
+	return cr.Spec.Port
+}
+
+func (cr VMAgent) ProbeNeedLiveness() bool {
+	return true
+}
+
 func init() {
 	SchemeBuilder.Register(&VMAgent{}, &VMAgentList{})
 }
diff --git a/api/v1beta1/vmalert_types.go b/api/v1beta1/vmalert_types.go
@@ -362,6 +362,27 @@ type VMAlert struct {
 	Status VMAlertStatus `json:"status,omitempty"`
 }
 
+func (cr *VMAlert) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAlert) ProbePath() string {
+
+	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
+}
+
+func (cr *VMAlert) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr VMAlert) ProbePort() string {
+	return cr.Spec.Port
+}
+
+func (cr VMAlert) ProbeNeedLiveness() bool {
+	return true
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // VMAlertList contains a list of VMAlert
@@ -435,9 +456,7 @@ func (cr VMAlert) PrefixedName() string {
 func (cr VMAlert) TLSAssetName() string {
 	return fmt.Sprintf("tls-assets-vmalert-%s", cr.Name)
 }
-func (cr VMAlert) HealthPath() string {
-	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
-}
+
 func (cr VMAlert) MetricPath() string {
 	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, metricPath)
 }

diff --git a/api/v1beta1/vmalertmanager_types.go b/api/v1beta1/vmalertmanager_types.go
@@ -430,6 +430,30 @@ func (cr *VMAlertmanager) GetVolumeName() string {
 	return fmt.Sprintf("vmalertmanager-%s-db", cr.Name)
 }
 
+func (cr *VMAlertmanager) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAlertmanager) ProbePath() string {
+	webRoutePrefix := "/"
+	if cr.Spec.RoutePrefix != "" {
+		webRoutePrefix = cr.Spec.RoutePrefix
+	}
+	return path.Clean(webRoutePrefix + "/-/healthy")
+}
+
+func (cr *VMAlertmanager) ProbePort() string {
+	return cr.Spec.PortName
+}
+
+func (cr *VMAlertmanager) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr *VMAlertmanager) ProbeNeedLiveness() bool {
+	return true
+}
+
 func init() {
 	SchemeBuilder.Register(&VMAlertmanager{}, &VMAlertmanagerList{})
 }
diff --git a/api/v1beta1/vmauth_types.go b/api/v1beta1/vmauth_types.go
@@ -220,6 +220,27 @@ type VMAuth struct {
 	Status VMAuthStatus `json:"status,omitempty"`
 }
 
+func (cr *VMAuth) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAuth) ProbePath() string {
+	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
+}
+
+func (cr *VMAuth) ProbeScheme() string {
+
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr *VMAuth) ProbePort() string {
+	return cr.Spec.Port
+}
+
+func (cr *VMAuth) ProbeNeedLiveness() bool {
+	return true
+}
+
 // +kubebuilder:object:root=true
 
 // VMAuthList contains a list of VMAuth
@@ -295,10 +316,6 @@ func (cr VMAuth) ConfigSecretName() string {
 	return fmt.Sprintf("vmauth-config-%s", cr.Name)
 }
 
-func (cr VMAuth) HealthPath() string {
-	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
-}
-
 func (cr VMAuth) MetricPath() string {
 	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, metricPath)
 }

diff --git a/api/v1beta1/vmcluster_types.go b/api/v1beta1/vmcluster_types.go
@@ -458,6 +458,26 @@ type VMInsert struct {
 	TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
 }
 
+func (cr *VMInsert) Probe() *EmbeddedProbes {
+	return cr.EmbeddedProbes
+}
+
+func (cr *VMInsert) ProbePath() string {
+	return buildPathWithPrefixFlag(cr.ExtraArgs, healthPath)
+}
+
+func (cr *VMInsert) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.ExtraArgs))
+}
+
+func (cr *VMInsert) ProbePort() string {
+	return cr.Port
+}
+
+func (cr *VMInsert) ProbeNeedLiveness() bool {
+	return true
+}
+
 func (i VMInsert) GetNameWithPrefix(clusterName string) string {
 	if i.Name == "" {
 		return PrefixedName(clusterName, "vminsert")
@@ -893,27 +913,6 @@ func (cr *VMCluster) GetLastAppliedSpec() (*VMClusterSpec, error) {
 	return &prevClusterSpec, nil
 }
 
-func (cr VMCluster) HealthPathSelect() string {
-	if cr.Spec.VMSelect == nil {
-		return healthPath
-	}
-	return buildPathWithPrefixFlag(cr.Spec.VMSelect.ExtraArgs, healthPath)
-}
-
-func (cr VMCluster) HealthPathInsert() string {
-	if cr.Spec.VMInsert == nil {
-		return healthPath
-	}
-	return buildPathWithPrefixFlag(cr.Spec.VMInsert.ExtraArgs, healthPath)
-}
-
-func (cr VMCluster) HealthPathStorage() string {
-	if cr.Spec.VMStorage == nil {
-		return healthPath
-	}
-	return buildPathWithPrefixFlag(cr.Spec.VMStorage.ExtraArgs, healthPath)
-}
-
 func (cr VMCluster) MetricPathSelect() string {
 	if cr.Spec.VMSelect == nil {
 		return healthPath
@@ -1036,3 +1035,39 @@ func (cr *VMCluster) AsCRDOwner() []metav1.OwnerReference {
 func (cr VMCluster) GetNSName() string {
 	return cr.GetNamespace()
 }
+
+func (cr *VMSelect) Probe() *EmbeddedProbes {
+	return cr.EmbeddedProbes
+}
+
+func (cr *VMSelect) ProbePath() string {
+	return buildPathWithPrefixFlag(cr.ExtraArgs, healthPath)
+}
+
+func (cr *VMSelect) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.ExtraArgs))
+}
+func (cr *VMSelect) ProbePort() string {
+	return cr.Port
+}
+func (cr *VMSelect) ProbeNeedLiveness() bool {
+	return true
+}
+
+func (cr *VMStorage) Probe() *EmbeddedProbes {
+	return cr.EmbeddedProbes
+}
+
+func (cr *VMStorage) ProbePath() string {
+	return buildPathWithPrefixFlag(cr.ExtraArgs, healthPath)
+}
+
+func (cr *VMStorage) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.ExtraArgs))
+}
+func (cr *VMStorage) ProbePort() string {
+	return cr.Port
+}
+func (cr *VMStorage) ProbeNeedLiveness() bool {
+	return false
+}
diff --git a/api/v1beta1/vmsingle_types.go b/api/v1beta1/vmsingle_types.go
@@ -218,6 +218,26 @@ type VMSingle struct {
 	Status VMSingleStatus `json:"status,omitempty"`
 }
 
+func (cr *VMSingle) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMSingle) ProbePath() string {
+	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
+}
+
+func (cr *VMSingle) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr *VMSingle) ProbePort() string {
+	return cr.Spec.Port
+}
+
+func (cr *VMSingle) ProbeNeedLiveness() bool {
+	return false
+}
+
 // VMSingleList contains a list of VMSingle
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type VMSingleList struct {
@@ -288,10 +308,6 @@ func (cr VMSingle) PrefixedName() string {
 	return fmt.Sprintf("vmsingle-%s", cr.Name)
 }
 
-func (cr VMSingle) HealthPath() string {
-	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
-}
-
 func (cr VMSingle) MetricPath() string {
 	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, metricPath)
 }

diff --git a/api/victoriametrics/v1beta1/vmagent_types.go b/api/victoriametrics/v1beta1/vmagent_types.go
@@ -612,6 +612,27 @@ func (cr *VMAgent) AsCRDOwner() []metav1.OwnerReference {
 	return GetCRDAsOwner(Agent)
 }
 
+func (cr *VMAgent) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAgent) ProbePath() string {
+
+	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
+}
+
+func (cr *VMAgent) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr VMAgent) ProbePort() string {
+	return cr.Spec.Port
+}
+
+func (cr VMAgent) ProbeNeedLiveness() bool {
+	return true
+}
+
 func init() {
 	SchemeBuilder.Register(&VMAgent{}, &VMAgentList{})
 }
diff --git a/api/victoriametrics/v1beta1/vmalert_types.go b/api/victoriametrics/v1beta1/vmalert_types.go
@@ -362,6 +362,27 @@ type VMAlert struct {
 	Status VMAlertStatus `json:"status,omitempty"`
 }
 
+func (cr *VMAlert) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAlert) ProbePath() string {
+
+	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
+}
+
+func (cr *VMAlert) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr VMAlert) ProbePort() string {
+	return cr.Spec.Port
+}
+
+func (cr VMAlert) ProbeNeedLiveness() bool {
+	return true
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // VMAlertList contains a list of VMAlert
@@ -435,9 +456,7 @@ func (cr VMAlert) PrefixedName() string {
 func (cr VMAlert) TLSAssetName() string {
 	return fmt.Sprintf("tls-assets-vmalert-%s", cr.Name)
 }
-func (cr VMAlert) HealthPath() string {
-	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, healthPath)
-}
+
 func (cr VMAlert) MetricPath() string {
 	return buildPathWithPrefixFlag(cr.Spec.ExtraArgs, metricPath)
 }

diff --git a/api/victoriametrics/v1beta1/vmalertmanager_types.go b/api/victoriametrics/v1beta1/vmalertmanager_types.go
@@ -430,6 +430,30 @@ func (cr *VMAlertmanager) GetVolumeName() string {
 	return fmt.Sprintf("vmalertmanager-%s-db", cr.Name)
 }
 
+func (cr *VMAlertmanager) Probe() *EmbeddedProbes {
+	return cr.Spec.EmbeddedProbes
+}
+
+func (cr *VMAlertmanager) ProbePath() string {
+	webRoutePrefix := "/"
+	if cr.Spec.RoutePrefix != "" {
+		webRoutePrefix = cr.Spec.RoutePrefix
+	}
+	return path.Clean(webRoutePrefix + "/-/healthy")
+}
+
+func (cr *VMAlertmanager) ProbePort() string {
+	return cr.Spec.PortName
+}
+
+func (cr *VMAlertmanager) ProbeScheme() string {
+	return strings.ToUpper(protoFromFlags(cr.Spec.ExtraArgs))
+}
+
+func (cr *VMAlertmanager) ProbeNeedLiveness() bool {
+	return true
+}
+
 func init() {
 	SchemeBuilder.Register(&VMAlertmanager{}, &VMAlertmanagerList{})
 }