From 2adf6c904b26e75125837fc516ae86ff0d964927 Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Mon, 18 Sep 2023 14:32:22 +0200 Subject: [PATCH 1/3] Point the k8ssandra-operator image to the scarf proxy --- Makefile | 3 ++- charts/k8ssandra-operator/values.yaml | 2 +- config/deployments/default/kustomization.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e248c66d1..1f2bb4a90 100644 --- a/Makefile +++ b/Makefile @@ -281,7 +281,8 @@ create-kind-multicluster: scripts/setup-kind-multicluster.sh --clusters $(NUM_CLUSTERS) --kind-node-version $(KIND_NODE_VERSION) --kind-worker-nodes $(NUM_WORKER_NODES) --output-file $(KIND_KUBECONFIG) kind-load-image: - kind load docker-image --name $(KIND_CLUSTER) ${IMG} + docker tag ${IMG} cr.k8ssandra.io/${IMG} + kind load docker-image --name $(KIND_CLUSTER) cr.k8ssandra.io/${IMG} kind-load-image-multi: for ((i = 0; i < $(NUM_CLUSTERS); ++i)); do \ diff --git a/charts/k8ssandra-operator/values.yaml b/charts/k8ssandra-operator/values.yaml index 47c24c474..f2ab8a426 100644 --- a/charts/k8ssandra-operator/values.yaml +++ b/charts/k8ssandra-operator/values.yaml @@ -21,7 +21,7 @@ image: # -- Container registry containing the repository where the image resides registry: docker.io # -- Docker repository for cass-operator - repository: k8ssandra/k8ssandra-operator + repository: cr.k8ssandra.io/k8ssandra/k8ssandra-operator # -- Pull policy for the operator container pullPolicy: IfNotPresent # -- Tag of the k8ssandra-operator image to pull from image.repository diff --git a/config/deployments/default/kustomization.yaml b/config/deployments/default/kustomization.yaml index 55538af7c..c0f91bb16 100644 --- a/config/deployments/default/kustomization.yaml +++ b/config/deployments/default/kustomization.yaml @@ -4,5 +4,5 @@ namespace: k8ssandra-operator resources: - ../../default images: - - name: k8ssandra/k8ssandra-operator + - name: cr.k8ssandra.io/k8ssandra/k8ssandra-operator newTag: latest From 3d6132b087ec89c50418d47f16e8399152ebf97d Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Tue, 17 Oct 2023 17:32:42 +0200 Subject: [PATCH 2/3] Update changelog --- CHANGELOG/CHANGELOG-1.10.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG/CHANGELOG-1.10.md b/CHANGELOG/CHANGELOG-1.10.md index d9b51b977..e37c26135 100644 --- a/CHANGELOG/CHANGELOG-1.10.md +++ b/CHANGELOG/CHANGELOG-1.10.md @@ -15,6 +15,8 @@ When cutting a new release, update the `unreleased` heading to the tag being gen ## unreleased +* [CHANGE] [#1088](https://github.com/k8ssandra/k8ssandra-operator/issues/1088) Use the Scarf proxy for image coordinates +* [ENHANCEMENT] [#1073](https://github.com/k8ssandra/k8ssandra-operator/issues/1073) Add a namespace label to the Cassandra metrics * [ENHANCEMENT] [#1073](https://github.com/k8ssandra/k8ssandra-operator/issues/1073) Add a namespace label to the Cassandra metrics * [BUGFIX] [#1060](https://github.com/k8ssandra/k8ssandra-operator/issues/1060) Fix restore mapping shuffling nodes when restoring in place * [BUGFIX] [#1061](https://github.com/k8ssandra/k8ssandra-operator/issues/1061) Point to cass-config-builder 1.0.7 for arm64 compatibility From cbe54a308edecd05dc9385b1895c74ac8c7addef Mon Sep 17 00:00:00 2001 From: Alexander Dejanovski Date: Fri, 20 Oct 2023 20:25:14 +0200 Subject: [PATCH 3/3] Fix duplicate line --- CHANGELOG/CHANGELOG-1.10.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG/CHANGELOG-1.10.md b/CHANGELOG/CHANGELOG-1.10.md index e37c26135..575eee746 100644 --- a/CHANGELOG/CHANGELOG-1.10.md +++ b/CHANGELOG/CHANGELOG-1.10.md @@ -16,7 +16,6 @@ When cutting a new release, update the `unreleased` heading to the tag being gen ## unreleased * [CHANGE] [#1088](https://github.com/k8ssandra/k8ssandra-operator/issues/1088) Use the Scarf proxy for image coordinates -* [ENHANCEMENT] [#1073](https://github.com/k8ssandra/k8ssandra-operator/issues/1073) Add a namespace label to the Cassandra metrics * [ENHANCEMENT] [#1073](https://github.com/k8ssandra/k8ssandra-operator/issues/1073) Add a namespace label to the Cassandra metrics * [BUGFIX] [#1060](https://github.com/k8ssandra/k8ssandra-operator/issues/1060) Fix restore mapping shuffling nodes when restoring in place * [BUGFIX] [#1061](https://github.com/k8ssandra/k8ssandra-operator/issues/1061) Point to cass-config-builder 1.0.7 for arm64 compatibility