Drop Debug fields

These fields were redundant. Crashing pods can be debugged via oc debug. Implements: OSPRH-4290
openstack-k8s-operators · Feb 2, 2024 · e674727 · e674727
1 parent d7eed75
commit e674727
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 109 deletions.
diff --git a/api/bases/placement.openstack.org_placementapis.yaml b/api/bases/placement.openstack.org_placementapis.yaml
@@ -70,20 +70,6 @@ spec:
                   DB, defaults to placement TODO: -> implement needs work in mariadb-operator,
                   right now only placement'
                 type: string
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  dbSync:
-                    default: false
-                    description: DBSync enable debug
-                    type: boolean
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string

diff --git a/api/v1beta1/placementapi_types.go b/api/v1beta1/placementapi_types.go
@@ -82,11 +82,6 @@ type PlacementAPISpec struct {
 	// NodeSelector to target subset of worker nodes running this service
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 
-	// +kubebuilder:validation:Optional
-	// Debug - enable debug for different deploy stages. If an init container is used, it runs and the
-	// actual action pod gets started with sleep infinity
-	Debug PlacementAPIDebug `json:"debug,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=false
 	// PreserveJobs - do not delete jobs after they finished e.g. to check logs
@@ -143,18 +138,6 @@ type PasswordSelector struct {
 	Service string `json:"service"`
 }
 
-// PlacementAPIDebug defines the observed state of PlacementAPIDebug
-type PlacementAPIDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// DBSync enable debug
-	DBSync bool `json:"dbSync"`
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// Service enable debug
-	Service bool `json:"service"`
-}
-
 // PlacementAPIStatus defines the observed state of PlacementAPI
 type PlacementAPIStatus struct {
 	// ReadyCount of placement API instances

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/placement.openstack.org_placementapis.yaml b/config/crd/bases/placement.openstack.org_placementapis.yaml
@@ -70,20 +70,6 @@ spec:
                   DB, defaults to placement TODO: -> implement needs work in mariadb-operator,
                   right now only placement'
                 type: string
-              debug:
-                description: Debug - enable debug for different deploy stages. If
-                  an init container is used, it runs and the actual action pod gets
-                  started with sleep infinity
-                properties:
-                  dbSync:
-                    default: false
-                    description: DBSync enable debug
-                    type: boolean
-                  service:
-                    default: false
-                    description: Service enable debug
-                    type: boolean
-                type: object
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string

diff --git a/config/samples/placement_v1beta1_placementapi.yaml b/config/samples/placement_v1beta1_placementapi.yaml
@@ -9,9 +9,6 @@ spec:
     debug = true
   databaseInstance: openstack
   databaseUser: placement
-  debug:
-    dbSync: false
-    service: false
   preserveJobs: false
   replicas: 1
   secret: placement-secret

diff --git a/config/samples/placement_v1beta1_placementtls.yaml b/config/samples/placement_v1beta1_placementtls.yaml
@@ -9,9 +9,6 @@ spec:
     debug = true
   databaseInstance: openstack
   databaseUser: placement
-  debug:
-    dbSync: false
-    service: false
   preserveJobs: false
   replicas: 1
   secret: placement-secret

diff --git a/pkg/placement/dbsync.go b/pkg/placement/dbsync.go
@@ -18,7 +18,6 @@ package placement
 import (
 	placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
 
-	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
 
 	batchv1 "k8s.io/api/batch/v1"
@@ -33,12 +32,7 @@ func DbSyncJob(
 	labels map[string]string,
 	annotations map[string]string,
 ) *batchv1.Job {
-	args := []string{"-c"}
-	if instance.Spec.Debug.DBSync {
-		args = append(args, common.DebugCommand)
-	} else {
-		args = append(args, KollaServiceCommand)
-	}
+	args := []string{"-c", KollaServiceCommand}
 
 	envVars := map[string]env.Setter{}
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")

diff --git a/pkg/placement/deployment.go b/pkg/placement/deployment.go
@@ -56,36 +56,20 @@ func Deployment(
 		InitialDelaySeconds: 5,
 	}
 
-	args := []string{"-c"}
-	if instance.Spec.Debug.Service {
-		args = append(args, common.DebugCommand)
-		livenessProbe.Exec = &corev1.ExecAction{
-			Command: []string{
-				"/bin/true",
-			},
-		}
-
-		readinessProbe.Exec = &corev1.ExecAction{
-			Command: []string{
-				"/bin/true",
-			},
-		}
-	} else {
-		args = append(args, KollaServiceCommand)
-		//
-		// https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
-		//
-		livenessProbe.HTTPGet = &corev1.HTTPGetAction{
-			Port: intstr.IntOrString{Type: intstr.Int, IntVal: int32(PlacementPublicPort)},
-		}
-		readinessProbe.HTTPGet = &corev1.HTTPGetAction{
-			Port: intstr.IntOrString{Type: intstr.Int, IntVal: int32(PlacementPublicPort)},
-		}
+	args := []string{"-c", KollaServiceCommand}
+	//
+	// https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+	//
+	livenessProbe.HTTPGet = &corev1.HTTPGetAction{
+		Port: intstr.IntOrString{Type: intstr.Int, IntVal: int32(PlacementPublicPort)},
+	}
+	readinessProbe.HTTPGet = &corev1.HTTPGetAction{
+		Port: intstr.IntOrString{Type: intstr.Int, IntVal: int32(PlacementPublicPort)},
+	}
 
-		if instance.Spec.TLS.API.Enabled(service.EndpointPublic) {
-			livenessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
-			readinessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
-		}
+	if instance.Spec.TLS.API.Enabled(service.EndpointPublic) {
+		livenessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
+		readinessProbe.HTTPGet.Scheme = corev1.URISchemeHTTPS
 	}
 
 	envVars := map[string]env.Setter{}

diff --git a/tests/kuttl/common/assert_sample_deployment.yaml b/tests/kuttl/common/assert_sample_deployment.yaml
@@ -10,9 +10,6 @@ spec:
     debug = true
   databaseInstance: openstack
   databaseUser: placement
-  debug:
-    dbSync: false
-    service: false
   passwordSelectors:
     database: PlacementDatabasePassword
     service: PlacementPassword

diff --git a/tests/kuttl/tests/placement_deploy_tls/03-assert.yaml b/tests/kuttl/tests/placement_deploy_tls/03-assert.yaml
@@ -10,9 +10,6 @@ spec:
     debug = true
   databaseInstance: openstack
   databaseUser: placement
-  debug:
-    dbSync: false
-    service: false
   passwordSelectors:
     database: PlacementDatabasePassword
     service: PlacementPassword