Remove unused mssql ops api fields, defaulting exporter port (#1334)

Signed-off-by: Neaj Morshad <neaj@appscode.com>
kubedb · Oct 31, 2024 · 019239f · 019239f
1 parent 241cc2e
commit 019239f
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 25 deletions.
diff --git a/apis/autoscaling/v1alpha1/mssqlserver_types.go b/apis/autoscaling/v1alpha1/mssqlserver_types.go
@@ -79,9 +79,6 @@ type MSSQLServerStorageAutoscalerSpec struct {
 }
 
 type MSSQLServerOpsRequestOptions struct {
-	// Specifies the Readiness Criteria
-	ReadinessCriteria *opsapi.MSSQLServerReplicaReadinessCriteria `json:"readinessCriteria,omitempty"`
-
 	// Timeout for each step of the ops request in second. If a step doesn't finish within the specified timeout, the ops request will result in failure.
 	Timeout *metav1.Duration `json:"timeout,omitempty"`
 

diff --git a/apis/autoscaling/v1alpha1/openapi_generated.go b/apis/autoscaling/v1alpha1/openapi_generated.go
diff --git a/apis/autoscaling/v1alpha1/type.go b/apis/autoscaling/v1alpha1/type.go
@@ -80,7 +80,7 @@ type ComputeAutoscalerSpec struct {
 	// +optional
 	ResourceDiffPercentage int32 `json:"resourceDiffPercentage,omitempty"`
 
-	// Specifies the minimum pod life time. The default is 15m.
+	// Specifies the minimum pod lifetime. The default is 15m.
 	// If the resource Request is inside the recommended range & there is no quickOOM (out-of-memory),
 	// we can still update the pod, if that pod's lifeTime is greater than this threshold.
 	// +optional

diff --git a/apis/autoscaling/v1alpha1/zz_generated.deepcopy.go b/apis/autoscaling/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/kubedb/constants.go b/apis/kubedb/constants.go
@@ -400,6 +400,7 @@ const (
 	MSSQLDatabasePort                  = 1433
 	MSSQLDatabaseMirroringEndpointPort = 5022
 	MSSQLCoordinatorPort               = 2381
+	MSSQLMonitoringDefaultServicePort  = 9399
 
 	// environment variables
 	EnvAcceptEula        = "ACCEPT_EULA"

diff --git a/apis/kubedb/v1alpha2/mssqlserver_helpers.go b/apis/kubedb/v1alpha2/mssqlserver_helpers.go
@@ -379,8 +379,14 @@ func (m *MSSQLServer) SetDefaults() {
 
 	m.setDefaultContainerResourceLimits(m.Spec.PodTemplate)
 
-	m.Spec.Monitor.SetDefaults()
-	if m.Spec.Monitor != nil && m.Spec.Monitor.Prometheus != nil {
+	if m.Spec.Monitor != nil {
+		if m.Spec.Monitor.Prometheus == nil {
+			m.Spec.Monitor.Prometheus = &mona.PrometheusSpec{}
+		}
+		if m.Spec.Monitor.Prometheus.Exporter.Port == 0 {
+			m.Spec.Monitor.Prometheus.Exporter.Port = kubedb.MSSQLMonitoringDefaultServicePort
+		}
+		m.Spec.Monitor.SetDefaults()
 		if m.Spec.Monitor.Prometheus.Exporter.SecurityContext.RunAsUser == nil {
 			m.Spec.Monitor.Prometheus.Exporter.SecurityContext.RunAsUser = mssqlVersion.Spec.SecurityContext.RunAsUser
 		}

diff --git a/apis/ops/v1alpha1/mssqlserver_ops_types.go b/apis/ops/v1alpha1/mssqlserver_ops_types.go
@@ -107,7 +107,7 @@ type MSSQLServerVerticalScalingSpec struct {
 
 // MSSQLServerVolumeExpansionSpec is the spec for MSSQLServer volume expansion
 type MSSQLServerVolumeExpansionSpec struct {
-	// volume specification for Postgres
+	// volume specification for MSSQLServer
 	MSSQLServer *resource.Quantity  `json:"mssqlserver,omitempty"`
 	Mode        VolumeExpansionMode `json:"mode"`
 }

diff --git a/apis/ops/v1alpha1/openapi_generated.go b/apis/ops/v1alpha1/openapi_generated.go
diff --git a/crds/autoscaling.kubedb.com_mssqlserverautoscalers.yaml b/crds/autoscaling.kubedb.com_mssqlserverautoscalers.yaml
@@ -107,8 +107,6 @@ spec:
                     - IfReady
                     - Always
                     type: string
-                  readinessCriteria:
-                    type: object
                   timeout:
                     type: string
                 type: object

diff --git a/pkg/phase/phase.go b/pkg/phase/phase.go
@@ -113,7 +113,7 @@ func PhaseFromCondition(conditions []kmapi.Condition) olddbapi.DatabasePhase {
 			return olddbapi.DatabasePhaseDataRestoring
 		}
 	}
-	if cutil.IsConditionFalse(conditions, kubedb.DatabaseDataRestored) {
+	if cutil.HasCondition(conditions, kubedb.DatabaseDataRestored) && cutil.IsConditionFalse(conditions, kubedb.DatabaseDataRestored) {
 		return olddbapi.DatabasePhaseNotReady
 	}
 
@@ -204,7 +204,7 @@ func PhaseFromConditionV1(conditions []kmapi.Condition) dbapi.DatabasePhase {
 			return dbapi.DatabasePhaseDataRestoring
 		}
 	}
-	if cutil.IsConditionFalse(conditions, kubedb.DatabaseDataRestored) {
+	if cutil.HasCondition(conditions, kubedb.DatabaseDataRestored) && cutil.IsConditionFalse(conditions, kubedb.DatabaseDataRestored) {
 		return dbapi.DatabasePhaseNotReady
 	}