Merge pull request #375 from fmount/defaultconfigoverwrite

Remove DefaultConfigOverwrite from CRD
openstack-k8s-operators · Nov 29, 2023 · 0b292f3 · 0b292f3
2 parents fe2050e + f386c18
commit 0b292f3
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 56 deletions.
diff --git a/api/bases/glance.openstack.org_glanceapis.yaml b/api/bases/glance.openstack.org_glanceapis.yaml
@@ -66,10 +66,6 @@ spec:
                     default: false
                     type: boolean
                 type: object
-              defaultConfigOverwrite:
-                additionalProperties:
-                  type: string
-                type: object
               extraMounts:
                 items:
                   properties:

diff --git a/api/bases/glance.openstack.org_glances.yaml b/api/bases/glance.openstack.org_glances.yaml
@@ -58,10 +58,6 @@ spec:
                     default: false
                     type: boolean
                 type: object
-              defaultConfigOverwrite:
-                additionalProperties:
-                  type: string
-                type: object
               extraMounts:
                 items:
                   properties:
@@ -834,10 +830,6 @@ spec:
                         default: false
                         type: boolean
                     type: object
-                  defaultConfigOverwrite:
-                    additionalProperties:
-                      type: string
-                    type: object
                   networkAttachments:
                     items:
                       type: string

diff --git a/api/v1beta1/common.go b/api/v1beta1/common.go
@@ -72,12 +72,6 @@ type GlanceAPITemplate struct {
 	// to /etc/<service>/<service>.conf.d directory as custom.conf file.
 	CustomServiceConfig string `json:"customServiceConfig,omitempty"`
 
-	// +kubebuilder:validation:Optional
-	// ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
-	// But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
-	// TODO: -> implement
-	DefaultConfigOverwrite map[string]string `json:"defaultConfigOverwrite,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// CustomServiceConfigSecrets - customize the service config using this parameter to specify Secrets
 	// that contain sensitive service config data. The content of each Secret gets added to the

diff --git a/api/v1beta1/glance_types.go b/api/v1beta1/glance_types.go
@@ -85,12 +85,6 @@ type GlanceSpec struct {
 	// to /etc/<service>/<service>.conf.d directory as custom.conf file.
 	CustomServiceConfig string `json:"customServiceConfig,omitempty"`
 
-	// +kubebuilder:validation:Optional
-	// ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
-	// But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
-	// TODO: -> implement
-	DefaultConfigOverwrite map[string]string `json:"defaultConfigOverwrite,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// CustomServiceConfigSecrets - customize the service config using this parameter to specify Secrets
 	// that contain sensitive service config data. The content of each Secret gets added to the

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
@@ -66,10 +66,6 @@ spec:
                     default: false
                     type: boolean
                 type: object
-              defaultConfigOverwrite:
-                additionalProperties:
-                  type: string
-                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
@@ -58,10 +58,6 @@ spec:
                     default: false
                     type: boolean
                 type: object
-              defaultConfigOverwrite:
-                additionalProperties:
-                  type: string
-                type: object
               extraMounts:
                 items:
                   properties:
@@ -834,10 +830,6 @@ spec:
                         default: false
                         type: boolean
                     type: object
-                  defaultConfigOverwrite:
-                    additionalProperties:
-                      type: string
-                    type: object
                   networkAttachments:
                     items:
                       type: string

diff --git a/controllers/glance_controller.go b/controllers/glance_controller.go
@@ -814,9 +814,6 @@ func (r *GlanceReconciler) generateServiceConfig(
 
 	customData := map[string]string{glance.CustomConfigFileName: instance.Spec.CustomServiceConfig}
 
-	for key, data := range instance.Spec.DefaultConfigOverwrite {
-		customData[key] = data
-	}
 	// Generate both default 00-config.conf and -scripts
 	return GenerateConfigsGeneric(ctx, h, instance, envVars, templateParameters, customData, labels, true)
 

diff --git a/controllers/glanceapi_controller.go b/controllers/glanceapi_controller.go
@@ -697,9 +697,6 @@ func (r *GlanceAPIReconciler) generateServiceConfig(
 
 	// 02-config.conf
 	customData := map[string]string{glance.CustomServiceConfigFileName: instance.Spec.CustomServiceConfig}
-	for key, data := range instance.Spec.DefaultConfigOverwrite {
-		customData[key] = data
-	}
 
 	// 03-config.conf
 	customSecrets := ""