Updated wrapper and package

charts/package/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.8.0
-digest: sha256:0119fce6b509ebf3eaf5218f87f6ec0af64ec7da15f272115673b0716c4b6919
-generated: "2023-08-08T17:31:11.735148021-04:00"
+  version: 2.13.3
+digest: sha256:9a971689db0c66ea95ac2e911c05014c2b96c6077c991131ff84f2982f88fb83
+generated: "2023-10-21T15:59:40.911552246-04:00"

charts/package/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: packager
-version: 1.0.0
+version: 1.0.1
 description: Allows bundling of supporting charts
 dependencies:
 - name: common

charts/package/templates/package/gitrepo.yml

@@ -4,7 +4,7 @@
 {{- $pkg = include "resourceName" $pkg -}}
 {{- $fluxSettings := merge (dig "flux" dict $vals) $.Values.flux -}}
 ---
-apiVersion: source.toolkit.fluxcd.io/v1
+apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: GitRepository
 metadata:
   name: {{ $pkg }}

charts/package/templates/package/helmreleases.yml

@@ -22,7 +22,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: {{ dig "helmRepo" "repoName" "registry1" $vals }}
-        namespace: {{ $.Release.Namespace }}
+        namespace: {{ dig "namespace" $.Release.Namespace $vals.helmRepo }}
       {{- else if $vals.git }}
       chart: {{ dig "git" "path" "chart" $vals }}
       sourceRef:
@@ -40,7 +40,8 @@ spec:
   {{- toYaml $vals.postRenderers | nindent 2 }}
   {{- end }}
   valuesFrom:
-  - name: {{ $pkg }}-values
-    kind: Secret
+  - kind: Secret
+    name: {{ $pkg }}-values
+  {{- toYaml $vals.valuesFrom | nindent 2 }}
 {{ end -}}
 {{- end -}}

charts/package/templates/sources/helmrepo.yml

@@ -0,0 +1,16 @@
+{{- /* Used for GitOps on a package's Helm chart */ -}}
+{{- range $pkg, $vals := .Values.sources -}}
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: {{ $pkg }}
+  namespace: {{ dig "namespace" "flux-system" $vals }}
+  labels:
+    app.kubernetes.io/name: {{ $pkg }}
+    {{- include "commonLabels" $ | nindent 4 }}
+spec:
+  url: {{ $vals.url }}
+  type: {{ dig "type" "generic" $vals }}
+  interval:  {{ dig "interval" "10m0s" $vals }}
+{{ end -}}

charts/package/templates/wrapper/values.yml

@@ -18,7 +18,7 @@ stringData:
     package:
       name: {{ $pkg }}
       {{- if (omit $overlays.package "git" "helmRepo" "flux" "postRenderers" "dependsOn") }}
-      {{- tpl (toYaml (omit $overlays.package "git" "helmRepo" "flux" "postRenderers" "dependsOn" "wrapper" "values")) $ | nindent 6 }}
+      {{- tpl (toYaml (omit $overlays.package "git" "helmRepo" "flux" "postRenderers" "dependsOn" "wrapper" "values" "valuesFrom")) $ | nindent 6 }}
       {{- end }}
 {{ end -}}
 {{- end -}}

charts/package/values.yaml

@@ -40,7 +40,7 @@ wrapper:
     # -- Name of the OCI chart in `repo`
     chartName: wrapper
     # -- Tag of the OCI chart in `repo`
-    tag: "1.0.5"
+    tag: "1.0.6"
 
 packages:
   sample:
@@ -62,6 +62,8 @@ packages:
       chartName:
       # -- Tag of the chart in the Helm repo, required
       tag:
+      # Namespace to find the helm repo.
+      namespace:
 
       # -- Git source is supported for both Helm and Kustomize deployments. If both `git` and `helmRepo` are provided `helmRepo` will take precedence.
     git:
@@ -79,6 +81,8 @@ packages:
       # -- Path inside of the git repo to find the helm chart or kustomize
       # @default -- For Helm charts `chart`.  For Kustomize `/`.
       path:
+      # Namespace to find the git repo.
+      namespace:
 
     # -- Override flux settings for this package
     flux: {}

charts/wrapper/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.8.0
-digest: sha256:0119fce6b509ebf3eaf5218f87f6ec0af64ec7da15f272115673b0716c4b6919
-generated: "2023-08-08T17:31:27.09446986-04:00"
+  version: 2.13.3
+digest: sha256:9a971689db0c66ea95ac2e911c05014c2b96c6077c991131ff84f2982f88fb83
+generated: "2023-10-21T15:59:27.551162809-04:00"

charts/wrapper/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: wrapper
-version: 1.0.5
+version: 1.0.6
 description: Adds extra supporting packages
 dependencies:
 - name: common