controllers: allows patching init config containers

it should be useful for ad-hoc patching #619
VictoriaMetrics · May 29, 2023 · 3da4af1 · 3da4af1
1 parent 65d8d0a
commit 3da4af1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/controllers/factory/vmagent.go b/controllers/factory/vmagent.go
@@ -498,11 +498,17 @@ func makeSpecForVMAgent(cr *victoriametricsv1beta1.VMAgent, c *config.BaseOperat
 			}
 		}
 	}
-	cr.Spec.InitContainers = maybeAddInitConfigContainer(cr.Spec.InitContainers, c, vmAgentConfDir, vmagentGzippedFilename, vmAgentConOfOutDir, configEnvsubstFilename)
+	ic := buildInitConfigContainer(c.VMAgentDefault.ConfigReloadImage, c, vmAgentConfDir, vmagentGzippedFilename, vmAgentConOfOutDir, configEnvsubstFilename)
+	if len(cr.Spec.InitContainers) > 0 {
+		ic, err = k8stools.MergePatchContainers(ic, cr.Spec.InitContainers)
+		if err != nil {
+			return nil, fmt.Errorf("cannot apply patch for initContainers: %w", err)
+		}
+	}
 	return &corev1.PodSpec{
 		NodeSelector:                  cr.Spec.NodeSelector,
 		Volumes:                       volumes,
-		InitContainers:                cr.Spec.InitContainers,
+		InitContainers:                ic,
 		Containers:                    containers,
 		ServiceAccountName:            cr.GetServiceAccountName(),
 		SecurityContext:               cr.Spec.SecurityContext,

diff --git a/controllers/factory/vmauth.go b/controllers/factory/vmauth.go
@@ -243,7 +243,6 @@ func makeSpecForVMAuth(cr *victoriametricsv1beta1.VMAuth, c *config.BaseOperator
 	}
 
 	configReloader := buildVMAuthConfigReloaderContainer(cr, c)
-	cr.Spec.InitContainers = maybeAddInitConfigContainer(cr.Spec.InitContainers, c, vmAuthConfigMountGz, vmAuthConfigNameGz, vmAuthConfigFolder, vmAuthConfigName)
 
 	vmauthContainer = buildProbe(vmauthContainer, cr)
 	operatorContainers := []corev1.Container{configReloader, vmauthContainer}
@@ -252,6 +251,13 @@ func makeSpecForVMAuth(cr *victoriametricsv1beta1.VMAuth, c *config.BaseOperator
 		return nil, err
 	}
 
+	ic := buildInitConfigContainer(c.VMAuthDefault.ConfigReloadImage, c, vmAuthConfigMountGz, vmAuthConfigNameGz, vmAuthConfigFolder, vmAuthConfigName)
+	if len(cr.Spec.InitContainers) > 0 {
+		ic, err = k8stools.MergePatchContainers(ic, cr.Spec.InitContainers)
+		if err != nil {
+			return nil, fmt.Errorf("cannot apply patch for initContainers: %w", err)
+		}
+	}
 	vmAuthSpec := &corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      cr.PodLabels(),
@@ -260,7 +266,7 @@ func makeSpecForVMAuth(cr *victoriametricsv1beta1.VMAuth, c *config.BaseOperator
 		Spec: corev1.PodSpec{
 			NodeSelector:                  cr.Spec.NodeSelector,
 			Volumes:                       volumes,
-			InitContainers:                cr.Spec.InitContainers,
+			InitContainers:                ic,
 			Containers:                    containers,
 			ServiceAccountName:            cr.GetServiceAccountName(),
 			SecurityContext:               cr.Spec.SecurityContext,
@@ -484,10 +490,10 @@ func buildVMAuthConfigReloaderContainer(cr *victoriametricsv1beta1.VMAuth, c *co
 	return configReloader
 }
 
-func maybeAddInitConfigContainer(src []corev1.Container, c *config.BaseOperatorConf, configDirName, configFileName, outConfigDir, outFileName string) []corev1.Container {
+func buildInitConfigContainer(baseImage string, c *config.BaseOperatorConf, configDirName, configFileName, outConfigDir, outFileName string) []corev1.Container {
 	// TODO add support for custom reloader
 	if c.UseCustomConfigReloader {
-		return src
+		return nil
 	}
 	initReloader := corev1.Container{
 		Image: formatContainerImage(c.ContainerRegistry, c.VMAgentDefault.ConfigReloadImage),
@@ -510,6 +516,5 @@ func maybeAddInitConfigContainer(src []corev1.Container, c *config.BaseOperatorC
 			},
 		},
 	}
-	src = append(src, initReloader)
-	return src
+	return []corev1.Container{initReloader}
 }