fix: use new variable name

Author: faiq

.github/workflows/checks.yml

@@ -253,7 +253,7 @@ jobs:
           devbox run -- \
             ct install \
               --config charts/ct-config.yaml \
-              --helm-extra-set-args "--set-string image.repository=ko.local/cluster-api-runtime-extensions-nutanix --set-string image.tag=$(devbox run -- gojq -r .version dist/metadata.json)-$(devbox run -- go env GOARCH) --set-string helmRepositoryImage.tag=$(devbox run -- gojq -r .version dist/metadata.json)-$(devbox run -- go env GOARCH)"
+              --helm-extra-set-args "--set-string image.repository=ko.local/cluster-api-runtime-extensions-nutanix --set-string image.tag=$(devbox run -- gojq -r .version dist/metadata.json)-$(devbox run -- go env GOARCH) --set-string helmChartsImage.tag=$(devbox run -- gojq -r .version dist/metadata.json)-$(devbox run -- go env GOARCH)"
         env:
           KUBECONFIG: ${{ env.KIND_KUBECONFIG }}
 

.goreleaser.yml

@@ -108,7 +108,7 @@ dockers:
       - hack/addons/mindthegap-helm-registry/repos.yaml
     build_flag_templates:
       - "--platform=linux/amd64"
-      - '--build-arg=version=v{{ trimprefix .Version "v" }}'
+      - '--build-arg=VERSION=v{{ trimprefix .Version "v" }}'
       - "--pull"
       - "--label=org.opencontainers.image.created={{.CommitDate}}"
       - "--label=org.opencontainers.image.title=caren-helm-reg"
@@ -125,7 +125,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--pull"
-      - '--build-arg=version=v{{ trimprefix .Version "v" }}'
+      - '--build-arg=VERSION=v{{ trimprefix .Version "v" }}'
       - "--label=org.opencontainers.image.created={{.CommitDate}}"
       - "--label=org.opencontainers.image.title=caren-helm-reg"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"

charts/cluster-api-runtime-extensions-nutanix/templates/helm-repository.yaml

@@ -32,7 +32,7 @@ metadata:
   finalizers:
   - kubernetes.io/pvc-protection
   name: charts-pvc
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 spec:
   accessModes:
   - ReadWriteOnce
@@ -61,10 +61,13 @@ spec:
         app: helm-repository  # pods have this label, and Service and Deployment depend on it
     spec:
       initContainers:
-      - name: init-container
+      - name: copy-charts
         image: "{{ .Values.helmChartsImage.repository }}:{{ default $.Chart.AppVersion .Values.helmChartsImage.tag }}"
         command: ["/bin/sh", "-c", "cp /charts/*.tar /helm-charts"]
         imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+        volumeMounts:
+        - name: charts-volume
+          mountPath: "/helm-charts"
       containers:
       - name: helm-repository
         ports:

hack/addons/mindthegap-helm-registry/Dockerfile

@@ -1,9 +1,9 @@
 ARG VERSION
-ARG MINDTHEGAP_VERSION
+ARG MINDTHEGAP_VERSION=v1.14.4
 FROM --platform=${BUILDPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERSION} as bundle_builder
 # this gets called by goreleaser so the copy source has to be the path relative to the repo root.
 RUN --mount=source=./hack/addons/mindthegap-helm-registry/repos.yaml,target=/repos.yaml \
-    ["/ko-app/mindthegap", "create", "bundle", "--helm-charts-file=/repos.yaml", "--output-file=/tmp/helm-charts-${VERSION}.tar"]
+    ["/ko-app/mindthegap", "create", "bundle", "--helm-charts-file=/repos.yaml", "--output-file=/tmp/helm-charts.tar"]
 
 FROM --platform=${TARGETPLATFORM} alpine
-COPY --from=bundle_builder /tmp/helm-charts-${VERSION}.tar /charts/helm-charts-${VERSION}.tar
+COPY --from=bundle_builder /tmp/helm-charts.tar /charts/helm-charts-${VERSION}.tar

make/dev.mk

@@ -15,7 +15,7 @@ dev.run-on-kind:
 	helm upgrade --install cluster-api-runtime-extensions-nutanix ./charts/cluster-api-runtime-extensions-nutanix \
 		--set-string image.repository=ko.local/cluster-api-runtime-extensions-nutanix \
 		--set-string image.tag=$(SNAPSHOT_VERSION) \
-		--set-string helmRepositoryImage.tag=$(SNAPSHOT_VERSION) \
+		--set-string helmChartsImage.tag=$(SNAPSHOT_VERSION) \
 		--wait --wait-for-jobs
 	kubectl rollout restart deployment cluster-api-runtime-extensions-nutanix
 	kubectl rollout restart deployment helm-repository