fix(chartmuseum) Add CACHE_URL environment variable only if cache sec…

…ret is specifed Signed-off-by: Pierre Péronnet <pierre.peronnet@ovhcloud.com>
goharbor · Mar 3, 2020 · ecd3f40 · ecd3f40
1 parent be30cbd
commit ecd3f40
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/controllers/harbor/components/chartmuseum/deployments.go b/controllers/harbor/components/chartmuseum/deployments.go
@@ -49,6 +49,7 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
 		Value: "/mnt/chartmuseum",
 	}}
 	envFroms := []corev1.EnvFromSource{}
+	initEnv := []corev1.EnvVar{}
 
 	if c.harbor.Spec.Components.ChartMuseum.StorageSecret != "" {
 		volumes = []corev1.Volume{}
@@ -86,6 +87,23 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
 		}}
 	}
 
+	if c.harbor.Spec.Components.ChartMuseum.CacheSecret != "" {
+		initEnv = []corev1.EnvVar{
+			{
+				Name: "CACHE_URL",
+				ValueFrom: &corev1.EnvVarSource{
+					SecretKeyRef: &corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{
+							Name: c.harbor.Spec.Components.ChartMuseum.CacheSecret,
+						},
+						Key:      containerregistryv1alpha1.HarborChartMuseumCacheURLKey,
+						Optional: &varTrue,
+					},
+				},
+			},
+		}
+	}
+
 	return []*appsv1.Deployment{
 		{
 			ObjectMeta: metav1.ObjectMeta{
@@ -158,20 +176,7 @@ func (c *ChartMuseum) GetDeployments(ctx context.Context) []*appsv1.Deployment {
 										ReadOnly:  false,
 									},
 								},
-								Env: []corev1.EnvVar{
-									{
-										Name: "CACHE_URL",
-										ValueFrom: &corev1.EnvVarSource{
-											SecretKeyRef: &corev1.SecretKeySelector{
-												LocalObjectReference: corev1.LocalObjectReference{
-													Name: c.harbor.Spec.Components.ChartMuseum.CacheSecret,
-												},
-												Key:      containerregistryv1alpha1.HarborChartMuseumCacheURLKey,
-												Optional: &varTrue,
-											},
-										},
-									},
-								},
+								Env: initEnv,
 							},
 						},
 						Containers: []corev1.Container{