Fix names of config-data volume mounts

These clashed with the existing config-data-merged mount which is included in all containers.
openstack-k8s-operators · Sep 16, 2024 · 0a26cab · 0a26cab
1 parent 25ef578
commit 0a26cab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/ironic/volumes.go b/pkg/ironic/volumes.go
@@ -106,7 +106,7 @@ func GetDBSyncVolumeMounts() []corev1.VolumeMount {
 
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "db-sync-config.json",
 			ReadOnly:  true,

diff --git a/pkg/ironicapi/volumes.go b/pkg/ironicapi/volumes.go
@@ -57,7 +57,7 @@ func GetInitVolumeMounts() []corev1.VolumeMount {
 func GetVolumeMounts() []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "ironic-api-config.json",
 			ReadOnly:  true,

diff --git a/pkg/ironicconductor/volumes.go b/pkg/ironicconductor/volumes.go
@@ -49,7 +49,7 @@ func GetInitVolumeMounts() []corev1.VolumeMount {
 func GetVolumeMounts(serviceName string) []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   serviceName + "-config.json",
 			ReadOnly:  true,

diff --git a/pkg/ironicneutronagent/volumes.go b/pkg/ironicneutronagent/volumes.go
@@ -90,7 +90,7 @@ func GetVolumeMounts() []corev1.VolumeMount {
 			ReadOnly:  false,
 		},
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "ironic-neutron-agent-config.json",
 			ReadOnly:  true,