Merge pull request #431 from fmount/no_debug

Do not expose debug section anymore
openstack-k8s-operators · Feb 2, 2024 · 007aeec · 007aeec
2 parents 961f905 + 7e76ada
commit 007aeec
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 394 deletions.
diff --git a/api/bases/glance.openstack.org_glanceapis.yaml b/api/bases/glance.openstack.org_glanceapis.yaml
@@ -60,12 +60,6 @@ spec:
               databaseUser:
                 default: glance
                 type: string
-              debug:
-                properties:
-                  service:
-                    default: false
-                    type: boolean
-                type: object
               extraMounts:
                 items:
                   properties:

diff --git a/api/bases/glance.openstack.org_glances.yaml b/api/bases/glance.openstack.org_glances.yaml
@@ -54,9 +54,6 @@ spec:
                   cronJob:
                     default: false
                     type: boolean
-                  dbSync:
-                    default: false
-                    type: boolean
                 type: object
               extraMounts:
                 items:
@@ -825,12 +822,6 @@ spec:
                       items:
                         type: string
                       type: array
-                    debug:
-                      properties:
-                        service:
-                          default: false
-                          type: boolean
-                      type: object
                     networkAttachments:
                       items:
                         type: string

diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -59,11 +59,6 @@ type GlanceAPITemplate 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 GlanceAPIDebug `json:"debug,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// Pvc - Storage claim for file-backed Glance
 	Pvc string `json:"pvc,omitempty"`

diff --git a/api/v1beta1/glance_types.go b/api/v1beta1/glance_types.go
@@ -141,10 +141,6 @@ type PasswordSelector struct {
 
 // GlanceDebug defines the observed state of GlanceAPIDebug
 type GlanceDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// DBSync enable debug
-	DBSync bool `json:"dbSync"`
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=false
 	// CronJob enable debug

diff --git a/api/v1beta1/glanceapi_types.go b/api/v1beta1/glanceapi_types.go
@@ -83,14 +83,6 @@ type GlanceAPISpec struct {
 	ImageCacheSize string `json:"imageCacheSize"`
 }
 
-// GlanceAPIDebug defines the observed state of GlanceAPIDebug
-type GlanceAPIDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// Service enable debug
-	Service bool `json:"service"`
-}
-
 // GlanceAPIStatus defines the observed state of GlanceAPI
 type GlanceAPIStatus struct {
 	// ReadyCount of glance API instances

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/glance.openstack.org_glanceapis.yaml b/config/crd/bases/glance.openstack.org_glanceapis.yaml
@@ -60,12 +60,6 @@ spec:
               databaseUser:
                 default: glance
                 type: string
-              debug:
-                properties:
-                  service:
-                    default: false
-                    type: boolean
-                type: object
               extraMounts:
                 items:
                   properties:

diff --git a/config/crd/bases/glance.openstack.org_glances.yaml b/config/crd/bases/glance.openstack.org_glances.yaml
@@ -54,9 +54,6 @@ spec:
                   cronJob:
                     default: false
                     type: boolean
-                  dbSync:
-                    default: false
-                    type: boolean
                 type: object
               extraMounts:
                 items:
@@ -825,12 +822,6 @@ spec:
                       items:
                         type: string
                       type: array
-                    debug:
-                      properties:
-                        service:
-                          default: false
-                          type: boolean
-                      type: object
                     networkAttachments:
                       items:
                         type: string