Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ jobs:
kind load docker-image \
--name "${KIND_CLUSTER_NAME}" \
"ko.local/cluster-api-runtime-extensions-nutanix:${{ steps.export-image-tag.outputs.test-image-tag }}" \
"ghcr.io/nutanix-cloud-native/caren-helm-reg:${{ steps.export-image-tag.outputs.test-image-tag }}"
"ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:${{ steps.export-image-tag.outputs.test-image-tag }}"

- if: steps.list-changed.outputs.changed == 'true'
name: Setup Cluster API and cert-manager
Expand Down
14 changes: 7 additions & 7 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ archives:

dockers:
- image_templates:
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-amd64'
- 'ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}-amd64'
use: buildx
dockerfile: ./hack/addons/helm-chart-bundler/Dockerfile
extra_files:
Expand All @@ -111,13 +111,13 @@ dockers:
- "--pull"
- '--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.title=cluster-api-runtime-extensions-helm-chart-bundle-initializer"
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
- '--label=org.opencontainers.image.version=v{{ trimprefix .Version "v" }}'
- "--label=org.opencontainers.image.source={{.GitURL}}"
goarch: amd64
- image_templates:
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-arm64'
- 'ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:v{{ trimprefix .Version "v" }}-arm64'
use: buildx
dockerfile: ./hack/addons/helm-chart-bundler/Dockerfile
extra_files:
Expand All @@ -127,17 +127,17 @@ dockers:
- "--pull"
- '--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.title=cluster-api-runtime-extensions-helm-chart-bundle-initializer"
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
- '--label=org.opencontainers.image.version=v{{ trimprefix .Version "v" }}'
- "--label=org.opencontainers.image.source={{.GitURL}}"
goarch: arm64

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

kos:
- id: cluster-api-runtime-extensions-nutanix
Expand Down
2 changes: 1 addition & 1 deletion charts/cluster-api-runtime-extensions-nutanix/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
| helmAddonsConfigMap | string | `"default-helm-addons-config"` | |
| helmRepository.enabled | bool | `true` | |
| helmRepository.images.bundleInitializer.pullPolicy | string | `"IfNotPresent"` | |
| helmRepository.images.bundleInitializer.repository | string | `"ghcr.io/nutanix-cloud-native/caren-helm-reg"` | |
| helmRepository.images.bundleInitializer.repository | string | `"ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer"` | |
| helmRepository.images.bundleInitializer.tag | string | `""` | |
| helmRepository.images.mindthegap.pullPolicy | string | `"IfNotPresent"` | |
| helmRepository.images.mindthegap.repository | string | `"ghcr.io/mesosphere/mindthegap"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/cluster-api-runtime-extensions-nutanix/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ helmRepository:
enabled: true
images:
bundleInitializer:
repository: ghcr.io/nutanix-cloud-native/caren-helm-reg
repository: ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer
tag: ""
pullPolicy: IfNotPresent
mindthegap:
Expand Down
2 changes: 1 addition & 1 deletion make/dev.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dev.run-on-kind: SNAPSHOT_VERSION = $(shell gojq -r '.version+"-"+.runtime.goarc
dev.run-on-kind:
kind load docker-image --name $(KIND_CLUSTER_NAME) \
ko.local/cluster-api-runtime-extensions-nutanix:$(SNAPSHOT_VERSION) \
ghcr.io/nutanix-cloud-native/caren-helm-reg:$(SNAPSHOT_VERSION)
ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:$(SNAPSHOT_VERSION)
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) \
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/config/caren.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ managementClusterName: caren-e2e
images:
- name: ko.local/cluster-api-runtime-extensions-nutanix:${E2E_IMAGE_TAG}
loadBehavior: mustLoad
- name: ghcr.io/nutanix-cloud-native/caren-helm-reg:${E2E_IMAGE_TAG}
- name: ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-helm-chart-bundle-initializer:${E2E_IMAGE_TAG}
loadBehavior: mustLoad

providers:
Expand Down
Loading