Merge branch '2205-add-functionality-to-package-wrapper-to-specify-hr-namespace' into 'master'

Resolve "Add functionality to package & Wrapper to specify HR Namespace"

Closes #2205

See merge request !4690

chart/templates/package/gitrepository.yaml

@@ -17,7 +17,11 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: {{ $pkg }}
-  namespace: {{ dig "namespace" "name" $pkg $vals }}
+  namespace:  {{ if dig "helmRelease" "namespace" nil (index $.Values.packages $pkg) }}
+                {{ dig "helmRelease" "namespace" "" (index $.Values.packages $pkg) }}
+              {{ else }}
+                {{ default (dig "namespace" "name" $pkg $vals) "" }}
+              {{ end }}
   labels:
     app.kubernetes.io/name: {{ $pkg }}
     {{- include "commonLabels" $ | nindent 4 }}

chart/templates/package/helmrelease.yaml

@@ -13,7 +13,11 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ $pkg }}
-  namespace: {{ dig "namespace" "name" $pkg $vals }}
+  namespace:  {{ if dig "helmRelease" "namespace" nil (index $.Values.packages $pkg) }}
+                {{ dig "helmRelease" "namespace" "" (index $.Values.packages $pkg) }}
+              {{ else }}
+                {{ default (dig "namespace" "name" $pkg $vals) "" }}
+              {{ end }}
   labels:
     app.kubernetes.io/name: {{ $pkg }}
     {{- include "commonLabels" $ | nindent 4 }}
@@ -21,6 +25,7 @@ metadata:
     checksum/bigbang-values: {{ (toJson $vals.values) | sha256sum }}
 spec:
   releaseName: {{ $pkg }}
+  targetNamespace: {{ dig "namespace" "name" $pkg $vals }}
   chart:
     spec:
       {{- if $vals.git }}
@@ -28,7 +33,11 @@ spec:
       sourceRef:
         kind: GitRepository
         name: {{ $pkg }}
-        namespace: {{ dig "namespace" "name" $pkg $vals }}
+        namespace:  {{ if dig "helmRelease" "namespace" nil (index $.Values.packages $pkg) }}
+                      {{ dig "helmRelease" "namespace" "" (index $.Values.packages $pkg) }}
+                    {{ else }}
+                      {{ default (dig "namespace" "name" $pkg $vals) "" }}
+                    {{ end }}
       {{- else if $vals.helmRepo }}
       chart: {{ dig "helmRepo" "chartName" $pkg $vals }}
       version: {{ dig "helmRepo" "tag" nil $vals }}

chart/templates/package/values.yaml

@@ -10,7 +10,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $pkg }}-values
-  namespace: {{ dig "namespace" "name" $pkg $vals }}
+  namespace:  {{ if dig "helmRelease" "namespace" nil (index $.Values.packages $pkg) }}
+                {{ dig "helmRelease" "namespace" "" (index $.Values.packages $pkg) }}
+              {{ else }}
+                {{ default (dig "namespace" "name" $pkg $vals) "" }}
+              {{ end }}
   labels:
     {{- include "commonLabels" $ | nindent 4 }}
 type: Opaque

chart/templates/wrapper/helmrelease.yaml

@@ -7,7 +7,11 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{ $pkg }}-wrapper
-  namespace: {{ dig "namespace" "name" $pkg $vals }}
+  namespace:  {{ if dig "helmRelease" "namespace" nil (index $.Values.packages $pkg) }}
+                {{ dig "helmRelease" "namespace" "" (index $.Values.packages $pkg) }}
+              {{ else }}
+                {{ default (dig "namespace" "name" $pkg $vals) "" }}
+              {{ end }}
   labels:
     app.kubernetes.io/name: {{ $pkg }}-wrapper
     {{- include "commonLabels" $ | nindent 4 }}

chart/templates/wrapper/values.yaml

@@ -6,7 +6,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $pkg }}-wrapper-values
-  namespace: {{ dig "namespace" "name" $pkg $vals }}
+  namespace:  {{ if dig "helmRelease" "namespace" nil (index $.Values.packages $pkg) }}
+                {{ dig "helmRelease" "namespace" "" (index $.Values.packages $pkg) }}
+              {{ else }}
+                {{ default (dig "namespace" "name" $pkg $vals) "" }}
+              {{ end }}
 type: Opaque
 stringData:
   values.yaml: |