Merge pull request fluxcd#76 from ibrokethecloud/uninstall

Minor tweak to pass targetNamespace to klipper-helm job
jtyr · Dec 4, 2020 · 8c2fd2a · 8c2fd2a
2 parents 277de81 + d5ece73
commit 8c2fd2a
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/helm/controller.go b/pkg/helm/controller.go
@@ -194,6 +194,11 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 		action = "delete"
 	}
 
+	targetNamespace := chart.Namespace
+	if len(chart.Spec.TargetNamespace) != 0 {
+		targetNamespace = chart.Spec.TargetNamespace
+	}
+
 	job := &batch.Job{
 		TypeMeta: meta.TypeMeta{
 			APIVersion: "batch/v1",
@@ -252,6 +257,10 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 									Name:  "HELM_VERSION",
 									Value: chart.Spec.HelmVersion,
 								},
+								{
+									Name:  "TARGET_NAMESPACE",
+									Value: targetNamespace,
+								},
 							},
 						},
 					},