Skip to content

Commit 08f70d4

Browse files
authored
build: rename caren-helm-reg to better match role (#969)
**What problem does this PR solve?**: While looking at #968 I noticed the image name. The `caren-helm-reg` image is no longer used as a registry. The word registry was also recently changed to repository in the templates. Renamed it to `cluster-api-runtime-extensions-bundle-initializer`, but open to suggestions! **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent 0f8bd4a commit 08f70d4

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
kind load docker-image \
247247
--name "${KIND_CLUSTER_NAME}" \
248248
"ko.local/cluster-api-runtime-extensions-nutanix:${{ steps.export-image-tag.outputs.test-image-tag }}" \
249-
"ghcr.io/nutanix-cloud-native/caren-helm-reg:${{ steps.export-image-tag.outputs.test-image-tag }}"
249+
"ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:${{ steps.export-image-tag.outputs.test-image-tag }}"
250250
251251
- if: steps.list-changed.outputs.changed == 'true'
252252
name: Setup Cluster API and cert-manager

.goreleaser.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ archives:
101101

102102
dockers:
103103
- image_templates:
104-
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-amd64'
104+
- 'ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}-amd64'
105105
use: buildx
106106
dockerfile: ./hack/addons/helm-chart-bundler/Dockerfile
107107
extra_files:
@@ -111,13 +111,13 @@ dockers:
111111
- "--pull"
112112
- '--build-arg=VERSION=v{{ trimprefix .Version "v" }}'
113113
- "--label=org.opencontainers.image.created={{.CommitDate}}"
114-
- "--label=org.opencontainers.image.title=caren-helm-reg"
114+
- "--label=org.opencontainers.image.title=cluster-api-runtime-extensions-helm-chart-bundle-initializer"
115115
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
116116
- '--label=org.opencontainers.image.version=v{{ trimprefix .Version "v" }}'
117117
- "--label=org.opencontainers.image.source={{.GitURL}}"
118118
goarch: amd64
119119
- image_templates:
120-
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-arm64'
120+
- 'ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}-arm64'
121121
use: buildx
122122
dockerfile: ./hack/addons/helm-chart-bundler/Dockerfile
123123
extra_files:
@@ -127,17 +127,17 @@ dockers:
127127
- "--pull"
128128
- '--build-arg=VERSION=v{{ trimprefix .Version "v" }}'
129129
- "--label=org.opencontainers.image.created={{.CommitDate}}"
130-
- "--label=org.opencontainers.image.title=caren-helm-reg"
130+
- "--label=org.opencontainers.image.title=cluster-api-runtime-extensions-helm-chart-bundle-initializer"
131131
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
132132
- '--label=org.opencontainers.image.version=v{{ trimprefix .Version "v" }}'
133133
- "--label=org.opencontainers.image.source={{.GitURL}}"
134134
goarch: arm64
135135

136136
docker_manifests:
137-
- name_template: ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}
137+
- name_template: ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}
138138
image_templates:
139-
- ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-amd64
140-
- ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-arm64
139+
- ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}-amd64
140+
- ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}-arm64
141141

142142
kos:
143143
- id: cluster-api-runtime-extensions-nutanix

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
3434
| helmAddonsConfigMap | string | `"default-helm-addons-config"` | |
3535
| helmRepository.enabled | bool | `true` | |
3636
| helmRepository.images.bundleInitializer.pullPolicy | string | `"IfNotPresent"` | |
37-
| helmRepository.images.bundleInitializer.repository | string | `"ghcr.io/nutanix-cloud-native/caren-helm-reg"` | |
37+
| helmRepository.images.bundleInitializer.repository | string | `"ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer"` | |
3838
| helmRepository.images.bundleInitializer.tag | string | `""` | |
3939
| helmRepository.images.mindthegap.pullPolicy | string | `"IfNotPresent"` | |
4040
| helmRepository.images.mindthegap.repository | string | `"ghcr.io/mesosphere/mindthegap"` | |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ helmRepository:
134134
enabled: true
135135
images:
136136
bundleInitializer:
137-
repository: ghcr.io/nutanix-cloud-native/caren-helm-reg
137+
repository: ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer
138138
tag: ""
139139
pullPolicy: IfNotPresent
140140
mindthegap:

make/dev.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dev.run-on-kind: SNAPSHOT_VERSION = $(shell gojq -r '.version+"-"+.runtime.goarc
1111
dev.run-on-kind:
1212
kind load docker-image --name $(KIND_CLUSTER_NAME) \
1313
ko.local/cluster-api-runtime-extensions-nutanix:$(SNAPSHOT_VERSION) \
14-
ghcr.io/nutanix-cloud-native/caren-helm-reg:$(SNAPSHOT_VERSION)
14+
ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:$(SNAPSHOT_VERSION)
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) \

test/e2e/config/caren.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ managementClusterName: caren-e2e
66
images:
77
- name: ko.local/cluster-api-runtime-extensions-nutanix:${E2E_IMAGE_TAG}
88
loadBehavior: mustLoad
9-
- name: ghcr.io/nutanix-cloud-native/caren-helm-reg:${E2E_IMAGE_TAG}
9+
- name: ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:${E2E_IMAGE_TAG}
1010
loadBehavior: mustLoad
1111

1212
providers:

0 commit comments

Comments
 (0)