Skip to content

Commit e425651

Browse files
committed
fix: changes name back to helmRepositoryImage
1 parent c9a05d1 commit e425651

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253
devbox run -- \
254254
ct install \
255255
--config charts/ct-config.yaml \
256-
--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)"
256+
--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)"
257257
env:
258258
KUBECONFIG: ${{ env.KIND_KUBECONFIG }}
259259

charts/cluster-api-runtime-extensions-nutanix/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
3232
| deployment.replicas | int | `1` | |
3333
| env | object | `{}` | |
3434
| helmAddonsConfigMap | string | `"default-helm-addons-config"` | |
35-
| helmChartsImage.pullPolicy | string | `"IfNotPresent"` | |
36-
| helmChartsImage.repository | string | `"ghcr.io/nutanix-cloud-native/caren-helm-reg"` | |
37-
| helmChartsImage.tag | string | `""` | |
35+
| helmRepositoryImage.pullPolicy | string | `"IfNotPresent"` | |
36+
| helmRepositoryImage.repository | string | `"ghcr.io/nutanix-cloud-native/caren-helm-reg"` | |
37+
| helmRepositoryImage.tag | string | `""` | |
3838
| hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
3939
| hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-aws-ccm-helm-values-template"` | |
4040
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.9"` | |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
spec:
6363
initContainers:
6464
- name: copy-charts
65-
image: "{{ .Values.helmChartsImage.repository }}:{{ default $.Chart.AppVersion .Values.helmChartsImage.tag }}"
65+
image: "{{ .Values.helmRepositoryImage.repository }}:{{ default $.Chart.AppVersion .Values.helmRepositoryImage.tag }}"
6666
command: ["/bin/sh", "-c", "cp /charts/*.tar /helm-charts"]
6767
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
6868
volumeMounts:
@@ -74,7 +74,7 @@ spec:
7474
- name: serve
7575
protocol: TCP
7676
containerPort: 5000
77-
image: "{{ .Values.helmChartsImage.repository }}:{{ default $.Chart.AppVersion .Values.helmChartsImage.tag }}"
77+
image: "{{ .Values.helmRepositoryImage.repository }}:{{ default $.Chart.AppVersion .Values.helmRepositoryImage.tag }}"
7878
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
7979
command: ["/usr/bin/mindthegap"]
8080
args:

charts/cluster-api-runtime-extensions-nutanix/values.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"helmAddonsConfigMap": {
3939
"type": "string"
4040
},
41-
"helmChartsImage": {
41+
"helmRepositoryImage": {
4242
"properties": {
4343
"pullPolicy": {
4444
"type": "string"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ image:
132132
tag: ""
133133
pullPolicy: IfNotPresent
134134

135-
helmChartsImage:
135+
helmRepositoryImage:
136136
repository: ghcr.io/nutanix-cloud-native/caren-helm-reg
137137
tag: ""
138138
pullPolicy: IfNotPresent

make/dev.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dev.run-on-kind:
1515
helm upgrade --install cluster-api-runtime-extensions-nutanix ./charts/cluster-api-runtime-extensions-nutanix \
1616
--set-string image.repository=ko.local/cluster-api-runtime-extensions-nutanix \
1717
--set-string image.tag=$(SNAPSHOT_VERSION) \
18-
--set-string helmChartsImage.tag=$(SNAPSHOT_VERSION) \
18+
--set-string helmRepositoryImage.tag=$(SNAPSHOT_VERSION) \
1919
--wait --wait-for-jobs
2020
kubectl rollout restart deployment cluster-api-runtime-extensions-nutanix
2121
kubectl rollout restart deployment helm-repository

0 commit comments

Comments
 (0)