[DNM] Update secret Template for PostRenderCleanup

Opting to remove extra lines from nova confs
openstack-k8s-operators · Sep 13, 2024 · 0b3a0d5 · 0b3a0d5
1 parent b05427a
commit 0b3a0d5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/controllers/common.go b/controllers/common.go
@@ -418,6 +418,7 @@ func (r *ReconcilerBase) generateConfigsGeneric(
 			CustomData:         extraData,
 			Annotations:        map[string]string{},
 			AdditionalTemplate: extraTemplates,
+			PostProcessCleanup: true,
 		},
 	}
 	if withScripts {

diff --git a/controllers/nova_controller.go b/controllers/nova_controller.go
@@ -1705,12 +1705,13 @@ func (r *NovaReconciler) ensureTopLevelSecret(
 	)
 
 	template := util.Template{
-		Name:         secretName,
-		Namespace:    instance.Namespace,
-		Type:         util.TemplateTypeNone,
-		InstanceType: instance.GetObjectKind().GroupVersionKind().Kind,
-		Labels:       labels,
-		CustomData:   data,
+		Name:               secretName,
+		Namespace:          instance.Namespace,
+		Type:               util.TemplateTypeNone,
+		InstanceType:       instance.GetObjectKind().GroupVersionKind().Kind,
+		Labels:             labels,
+		CustomData:         data,
+		PostProcessCleanup: true,
 	}
 
 	err := secret.EnsureSecrets(ctx, h, instance, []util.Template{template}, nil)

diff --git a/controllers/novametadata_controller.go b/controllers/novametadata_controller.go
@@ -826,6 +826,7 @@ func (r *NovaMetadataReconciler) generateNeutronConfigs(
 			ConfigOptions:      templateParameters,
 			Labels:             labels,
 			AdditionalTemplate: templates,
+			PostProcessCleanup: true,
 		},
 	}
 

diff --git a/go.mod b/go.mod
@@ -88,3 +88,5 @@ replace github.com/openstack-k8s-operators/nova-operator/api => ./api
 // mschuppert: map to latest commit from release-4.13 tag
 // must consistent within modules and service operators
 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
+
+replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/auniyal61/lib-common/modules/common v0.0.0-20240913130111-b5023a949271
diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/auniyal61/lib-common/modules/common v0.0.0-20240913130111-b5023a949271 h1:yxFK/NJ6GDaNP8G+pIeveM5rYpJGv/maetbiZPDXGSQ=
+github.com/auniyal61/lib-common/modules/common v0.0.0-20240913130111-b5023a949271/go.mod h1:6zxa5xg9uvpObVKFSJa/SA+vDDlgh0Q1aswxDB2XbxU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -78,8 +80,6 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240730162859-9
 github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240730162859-91b64b2d2de7/go.mod h1:OamtaW9c7aCtfUmxc/r+/XJS7XRI7s5iR//SZ8ilSwk=
 github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240730210414-ba2309d261a2 h1:F5NZmK9Gr12bHmNCJDRy7ad3I5j97adJ5Gm9HjSwV5g=
 github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240730210414-ba2309d261a2/go.mod h1:cSNSeN7+pXC/DLwtGoT9HsbdUYzbAnLHGtXN9/uugk8=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240905123813-174296c09ec6 h1:VSbVNzUa41hybq/lZi0L8bNv/yzYyNylc8yKSEO+ZCA=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240905123813-174296c09ec6/go.mod h1:6zxa5xg9uvpObVKFSJa/SA+vDDlgh0Q1aswxDB2XbxU=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240730142703-7fd3da600c9d h1:SRB1rCIVpaVhKxJPkSXE9CNN+xHSrdgXzrRV9ed/hIc=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240730142703-7fd3da600c9d/go.mod h1:TyZh5+Uwxb1vcyY44H5GJVulvlQxU05TTAPQ4tSmbzY=
 github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240730142703-7fd3da600c9d h1:P5tF3/shBcQf0HkPHWcr5Ri+jsRStMPbGOPQw4qRHRI=