diff --git a/cmd/flux/reconcile_helmrelease.go b/cmd/flux/reconcile_helmrelease.go index 1e08d829..0444d4b3 100644 --- a/cmd/flux/reconcile_helmrelease.go +++ b/cmd/flux/reconcile_helmrelease.go @@ -93,6 +93,10 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error { } if rhrArgs.syncHrWithSource { + nsCopy := rootArgs.namespace + if helmRelease.Spec.Chart.Spec.SourceRef.Namespace != "" { + rootArgs.namespace = helmRelease.Spec.Chart.Spec.SourceRef.Namespace + } switch helmRelease.Spec.Chart.Spec.SourceRef.Kind { case sourcev1.HelmRepositoryKind: err = reconcileSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name}) @@ -104,6 +108,7 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error { if err != nil { return err } + rootArgs.namespace = nsCopy } lastHandledReconcileAt := helmRelease.Status.LastHandledReconcileAt diff --git a/cmd/flux/reconcile_kustomization.go b/cmd/flux/reconcile_kustomization.go index 9f788b92..24f29094 100644 --- a/cmd/flux/reconcile_kustomization.go +++ b/cmd/flux/reconcile_kustomization.go @@ -91,6 +91,10 @@ func reconcileKsCmdRun(cmd *cobra.Command, args []string) error { } if rksArgs.syncKsWithSource { + nsCopy := rootArgs.namespace + if kustomization.Spec.SourceRef.Namespace != "" { + rootArgs.namespace = kustomization.Spec.SourceRef.Namespace + } switch kustomization.Spec.SourceRef.Kind { case sourcev1.GitRepositoryKind: err = reconcileSourceGitCmdRun(nil, []string{kustomization.Spec.SourceRef.Name}) @@ -100,6 +104,7 @@ func reconcileKsCmdRun(cmd *cobra.Command, args []string) error { if err != nil { return err } + rootArgs.namespace = nsCopy } lastHandledReconcileAt := kustomization.Status.LastHandledReconcileAt