From 57f1e91a51e9ca4300c061d7c8462854b046fff1 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 12 Dec 2023 12:12:42 +0100 Subject: [PATCH] t --- pkg/placement/dbsync.go | 2 +- pkg/placement/deployment.go | 2 +- pkg/placement/volumes.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/placement/dbsync.go b/pkg/placement/dbsync.go index ad6556ff..a7cd840f 100644 --- a/pkg/placement/dbsync.go +++ b/pkg/placement/dbsync.go @@ -46,7 +46,7 @@ func DbSyncJob( // create Volume and VolumeMounts volumes := getVolumes(instance.Name) - volumeMounts := getVolumeMounts() + volumeMounts := getVolumeMounts("dbsync") initVolumeMounts := getInitVolumeMounts() // add CA cert if defined diff --git a/pkg/placement/deployment.go b/pkg/placement/deployment.go index 49ffb0b7..c410ebf4 100644 --- a/pkg/placement/deployment.go +++ b/pkg/placement/deployment.go @@ -94,7 +94,7 @@ func Deployment( // create Volume and VolumeMounts volumes := getVolumes(instance.Name) - volumeMounts := getVolumeMounts() + volumeMounts := getVolumeMounts("api") // add CA cert if defined if instance.Spec.TLS.CaBundleSecretName != "" { diff --git a/pkg/placement/volumes.go b/pkg/placement/volumes.go index db907e4d..eec541fc 100644 --- a/pkg/placement/volumes.go +++ b/pkg/placement/volumes.go @@ -79,7 +79,7 @@ func getInitVolumeMounts() []corev1.VolumeMount { } // getVolumeMounts - general VolumeMounts -func getVolumeMounts() []corev1.VolumeMount { +func getVolumeMounts(serviceName string) []corev1.VolumeMount { return []corev1.VolumeMount{ { Name: "scripts", @@ -94,7 +94,7 @@ func getVolumeMounts() []corev1.VolumeMount { { Name: "config-data-merged", MountPath: "/var/lib/kolla/config_files/config.json", - SubPath: "placement-api-config.json", + SubPath: "placement-" + serviceName + "-config.json", ReadOnly: true, }, }