Skip to content

Commit

Permalink
fix; use new variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
faiq committed Oct 21, 2024
1 parent ada8a63 commit 252074a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ 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 }}"
Expand Down
6 changes: 3 additions & 3 deletions hack/addons/mindthegap-helm-registry/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion make/dev.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 252074a

Please sign in to comment.