Always use --debug for db purge

openstack-k8s-operators · Mar 18, 2024 · 5630afb · 5630afb
1 parent e40259d
commit 5630afb
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 49 deletions.
diff --git a/api/bases/cinder.openstack.org_cinders.yaml b/api/bases/cinder.openstack.org_cinders.yaml
@@ -353,12 +353,6 @@ spec:
                     default: 1 0 * * *
                     type: string
                 type: object
-              debug:
-                properties:
-                  dbPurge:
-                    default: false
-                    type: boolean
-                type: object
               extraMounts:
                 items:
                   properties:

diff --git a/api/v1beta1/cinder_types.go b/api/v1beta1/cinder_types.go
@@ -72,11 +72,6 @@ type CinderSpecBase struct {
 	// Memcached instance name.
 	MemcachedInstance string `json:"memcachedInstance"`
 
-	// +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 CinderDebug `json:"debug,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=false
 	// PreserveJobs - do not delete jobs after they finished e.g. to check logs
@@ -204,15 +199,6 @@ type DBPurge struct {
 	Schedule string `json:"schedule"`
 }
 
-// CinderDebug contains flags related to multiple debug activities. See the
-// individual comments for what this means for each flag.
-type CinderDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// DBPurge increases log verbosity by executing the db_purge command with "--debug".
-	DBPurge bool `json:"dbPurge"`
-}
-
 //+kubebuilder:object:root=true
 
 // CinderList contains a list of Cinder

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cinder.openstack.org_cinders.yaml b/config/crd/bases/cinder.openstack.org_cinders.yaml
@@ -353,12 +353,6 @@ spec:
                     default: 1 0 * * *
                     type: string
                 type: object
-              debug:
-                properties:
-                  dbPurge:
-                    default: false
-                    type: boolean
-                type: object
               extraMounts:
                 items:
                   properties:

diff --git a/pkg/cinder/cronjob.go b/pkg/cinder/cronjob.go
@@ -37,14 +37,8 @@ func CronJob(
 	cinderGroup := int64(cinderv1.CinderGroupID)
 	config0644AccessMode := int32(0644)
 
-	debugArg := ""
-	if instance.Spec.Debug.DBPurge {
-		debugArg = " --debug"
-	}
-
 	dbPurgeCommand := fmt.Sprintf(
-		"/usr/bin/cinder-manage%s --config-dir /etc/cinder/cinder.conf.d db purge %d",
-		debugArg,
+		"/usr/bin/cinder-manage --debug --config-dir /etc/cinder/cinder.conf.d db purge %d",
 		instance.Spec.DBPurge.Age)
 
 	args := []string{"-c", dbPurgeCommand}