Skip to content

Commit f907673

Browse files
committed
fix: uses the same image
1 parent 174b507 commit f907673

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,8 @@ spec:
7474
- name: serve
7575
protocol: TCP
7676
containerPort: 5000
77-
image: "{{ .Values.mindthegap.repository }}:{{ .Values.mindthegap.tag }}"
78-
imagePullPolicy: "{{ .Values.mindthegap.pullPolicy }}"
79-
args:
80-
- serve
81-
- bundle
82-
- --bundle=/helm-charts/helm-charts-*.tar
83-
- --listen-port=5000
84-
- --listen-address=0.0.0.0
85-
- --tls-private-key-file=/certs/tls.key
86-
- --tls-cert-file=/certs/tls.crt
77+
image: "{{ .Values.helmChartsImage.repository }}:{{ default $.Chart.AppVersion .Values.helmChartsImage.tag }}"
78+
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
8779
volumeMounts:
8880
- name: certs-vol
8981
mountPath: "/certs"

charts/cluster-api-runtime-extensions-nutanix/values.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@ helmChartsImage:
137137
tag: ""
138138
pullPolicy: IfNotPresent
139139

140-
mindthegap:
141-
repository: ghcr.io/mesosphere/mindthegap
142-
tag: "v1.14.4"
143-
pullPolicy: IfNotPresent
144-
145140
# -- Optional secrets used for pulling the container image
146141
imagePullSecrets: []
147142
# - name: Secret with Registry credentials

hack/addons/mindthegap-helm-registry/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,12 @@ RUN --mount=source=./hack/addons/mindthegap-helm-registry/repos.yaml,target=/rep
77
FROM --platform=${TARGETPLATFORM} alpine
88
ARG VERSION
99
COPY --from=bundle_builder /tmp/helm-charts.tar /charts/helm-charts-${VERSION}.tar
10+
COPY --from=bundle_builder /ko-app/mindthegap /usr/bin/mindthegap
11+
VOLUME /certs
12+
ENTRYPOINT /usr/bin/mindthegap
13+
CMD [ "serve", "bundle", \
14+
"--bundle=/tmp/helm-charts.tar", \
15+
"--listen-port=5000", \
16+
"--listen-address=0.0.0.0", \
17+
"--tls-private-key-file=/certs/tls.key", \
18+
"--tls-cert-file=/certs/tls.crt" ]

0 commit comments

Comments
 (0)