Updated Docker registry references

GHA writes images to us-docker.pkg.dev/k8ssandra/images
Tests and defaults refer to artifacts.k8ssandra.io/k8ssandra/images
Makefile updates for new repository locations

.github/actions/run-integ-test/action.yml

@@ -66,9 +66,9 @@ runs:
     - name: Load image on the nodes of the cluster
       shell: bash
       run: |
-        kind load docker-image --name=kind k8ssandra/cass-operator:latest
-        kind load docker-image --name=kind k8ssandra/system-logger:latest
+        kind load docker-image --name=kind us-docker.pkg.dev/k8ssandra/images/cass-operator:latest
+        kind load docker-image --name=kind us-docker.pkg.dev/k8ssandra/images/system-logger:latest
     - name: Run integration test ( ${{ inputs.integration_test }} )
       shell: bash
       run: |
-        IMG=k8ssandra/cass-operator:latest make integ-test
+        IMG=us-docker.pkg.dev/k8ssandra/images/cass-operator:latest make integ-test

.github/workflows/kindIntegTest.yml

@@ -29,7 +29,8 @@ jobs:
           file: Dockerfile
           context: .
           push: false
-          tags: k8ssandra/cass-operator:latest
+          tags: |
+            us-docker.pkg.dev/k8ssandra/images/cass-operator:latest
           platforms: linux/amd64
           outputs: type=docker,dest=/tmp/k8ssandra-cass-operator.tar
           cache-from: type=local,src=/tmp/.buildx-cache
@@ -39,7 +40,8 @@ jobs:
         with:
           file: logger.Dockerfile
           push: false
-          tags: k8ssandra/system-logger:latest
+          tags: |
+            us-docker.pkg.dev/k8ssandra/images/system-logger:latest
           outputs: type=docker,dest=/tmp/k8ssandra-system-logger.tar
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
@@ -137,9 +139,9 @@ jobs:
         - "4.0.3"
         include:
           - version: 3.11.7
-            serverImage: k8ssandra/cass-management-api:3.11.7-v0.1.24 # k8ssandra 1.1
+            serverImage: artifacts.k8ssandra.io/k8ssandra/images/cass-management-api:3.11.7-v0.1.24 # k8ssandra 1.1
           - version: 4.0.0
-            serverImage: k8ssandra/cass-management-api:4.0.0-v0.1.28 # k8ssandra 1.3
+            serverImage: artifacts.k8ssandra.io/k8ssandra/images/cass-management-api:4.0.0-v0.1.28 # k8ssandra 1.3
       fail-fast: true
     runs-on: ubuntu-latest
     env:

.github/workflows/operatorBuildAndDeploy.yml

@@ -56,11 +56,22 @@ jobs:
     runs-on: ubuntu-latest
     needs: testing
     if: github.ref == 'refs/heads/master'
+    # Add "id-token" with the intended permissions.
+    permissions:
+        contents: 'read'
+        id-token: 'write'
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v0'
+        with:
+            workload_identity_provider: 'projects/945064329182/locations/global/workloadIdentityPools/github-pool/providers/github'
+            service_account: 'gh-actions@k8ssandra.iam.gserviceaccount.com'
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v0'
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
@@ -73,20 +84,33 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      # Log in to Google Cloud Artifact Registry
+      - name: Login to GCP Artifact Registry
+        uses: 'docker/login-action@v1'
+        with:
+          registry: 'us-docker.pkg.dev'
+          username: 'oauth2accesstoken'
+          password: '${{ steps.auth.outputs.access_token }}'
       - name: Set git parsed values
         id: vars
         run: |
           echo ::set-output name=sha_short::$(git rev-parse --short=8 ${{ github.sha }})
           echo ::set-output name=tag_name::${GITHUB_REF#refs/tags/}
           echo ::set-output name=version::$(make version)
-      - name: Build and push
+      - name: Build and Push - Cass Operator
         id: docker_build_cass_operator
         uses: docker/build-push-action@v2
         with:
           file: Dockerfile
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: k8ssandra/cass-operator:${{ steps.vars.outputs.sha_short }}, k8ssandra/cass-operator:latest, k8ssandra/cass-operator:${{ steps.vars.outputs.version }}
+          tags: |
+            k8ssandra/cass-operator:${{ steps.vars.outputs.sha_short }}
+            k8ssandra/cass-operator:latest
+            k8ssandra/cass-operator:${{ steps.vars.outputs.version }}
+            us-docker.pkg.dev/k8ssandra/images/cass-operator:${{ steps.vars.outputs.sha_short }}
+            us-docker.pkg.dev/k8ssandra/images/cass-operator:latest
+            us-docker.pkg.dev/k8ssandra/images/cass-operator:${{ steps.vars.outputs.version }}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -96,13 +120,17 @@ jobs:
         with:
           file: logger.Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
-          tags: k8ssandra/system-logger:${{ steps.vars.outputs.sha_short }}, k8ssandra/system-logger:latest
+          tags: |
+            k8ssandra/system-logger:${{ steps.vars.outputs.sha_short }}
+            k8ssandra/system-logger:latest
+            us-docker.pkg.dev/k8ssandra/images/system-logger:${{ steps.vars.outputs.sha_short }}
+            us-docker.pkg.dev/k8ssandra/images/system-logger:latest
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: Create bundle
         run: |
-          make IMG=k8ssandra/cass-operator:${{ steps.vars.outputs.version }} VERSION=${{ steps.vars.outputs.version }} CHANNEL=dev bundle
+          make VERSION=${{ steps.vars.outputs.version }} CHANNEL=dev bundle
       - name: Build and push cass-operator-bundle
         id: docker_build_cass-operator_bundle
         uses: docker/build-push-action@v2
@@ -112,7 +140,9 @@ jobs:
             VERSION=${{ steps.vars.outputs.version }}
           context: .
           push: ${{ !env.ACT }}
-          tags: k8ssandra/cass-operator-bundle:v${{ steps.vars.outputs.version }}
+          tags: |
+            k8ssandra/cass-operator-bundle:v${{ steps.vars.outputs.version }}
+            us-docker.pkg.dev/k8ssandra/images/cass-operator-bundle:v${{ steps.vars.outputs.version }}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/release.yml

@@ -20,6 +20,13 @@ jobs:
           go-version: 1.18
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v0'
+        with:
+          workload_identity_provider: 'projects/945064329182/locations/global/workloadIdentityPools/github-pool/providers/github'
+          service_account: 'gh-actions@k8ssandra.iam.gserviceaccount.com'
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v0'
       - name: Cache Docker layers
         uses: actions/cache@v2
         if: ${{ !env.ACT }}
@@ -34,6 +41,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      # Log in to Google Cloud Artifact Registry
+      - name: Login to GCP Artifact Registry
+        uses: 'docker/login-action@v1'
+        with:
+          registry: 'us-docker.pkg.dev'
+          username: 'oauth2accesstoken'
+          password: '${{ steps.auth.outputs.access_token }}'
       - name: Set git parsed values
         id: vars
         shell: bash
@@ -50,7 +64,9 @@ jobs:
             VERSION=${{ env.TARGET_VERSION }}
           context: .
           load: true
-          tags: k8ssandra/system-logger:${{ steps.vars.outputs.tag_name}}
+          tags: |
+            k8ssandra/system-logger:${{ steps.vars.outputs.tag_name}}
+            us-docker.pkg.dev/k8ssandra/images/system-logger:${{ steps.vars.outputs.tag_name}}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -63,7 +79,9 @@ jobs:
             VERSION=${{ env.TARGET_VERSION }}
           context: .
           load: true
-          tags: k8ssandra/cass-operator:${{ steps.vars.outputs.tag_name}}
+          tags: |
+            k8ssandra/cass-operator:${{ steps.vars.outputs.tag_name}}
+            us-docker.pkg.dev/k8ssandra/images/cass-operator:${{ steps.vars.outputs.tag_name}}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -76,7 +94,9 @@ jobs:
             VERSION=${{ env.TARGET_VERSION }}
           context: .
           push: ${{ !env.ACT }}
-          tags: k8ssandra/system-logger:${{ steps.vars.outputs.tag_name}}
+          tags: |
+            k8ssandra/system-logger:${{ steps.vars.outputs.tag_name}}
+            us-docker.pkg.dev/k8ssandra/images/system-logger:${{ steps.vars.outputs.tag_name}}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -89,7 +109,9 @@ jobs:
             VERSION=${{ env.TARGET_VERSION }}
           context: .
           push: ${{ !env.ACT }}
-          tags: k8ssandra/cass-operator:${{ steps.vars.outputs.tag_name}}
+          tags: |
+            k8ssandra/cass-operator:${{ steps.vars.outputs.tag_name}}
+            us-docker.pkg.dev/k8ssandra/images/cass-operator:${{ steps.vars.outputs.tag_name}}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -98,8 +120,8 @@ jobs:
         if: ${{ !env.ACT }}
         # The double docker login is a workaround for RH's odd login issues
         run: |
-          docker tag k8ssandra/cass-operator:${{ steps.vars.outputs.tag_name}} scan.connect.redhat.com/ospid-18783bca-8f79-459c-aa0b-bda4e71c6ec3/cass-operator:${{ steps.vars.outputs.tag_name}}
-          docker tag k8ssandra/system-logger:${{ steps.vars.outputs.tag_name}} scan.connect.redhat.com/ospid-6138f998fb33d420b79f0af9/system-logger:${{ steps.vars.outputs.tag_name}}
+          docker tag us-docker.pkg.dev/k8ssandra/images/cass-operator:${{ steps.vars.outputs.tag_name}} scan.connect.redhat.com/ospid-18783bca-8f79-459c-aa0b-bda4e71c6ec3/cass-operator:${{ steps.vars.outputs.tag_name}}
+          docker tag us-docker.pkg.dev/k8ssandra/images/system-logger:${{ steps.vars.outputs.tag_name}} scan.connect.redhat.com/ospid-6138f998fb33d420b79f0af9/system-logger:${{ steps.vars.outputs.tag_name}}
           docker login -u unused scan.connect.redhat.com -p ${{ secrets.CASS_OPERATOR_CONNECT_SECRET }}
           docker push scan.connect.redhat.com/ospid-18783bca-8f79-459c-aa0b-bda4e71c6ec3/cass-operator:${{ steps.vars.outputs.tag_name}}
           docker login -u unused scan.connect.redhat.com -p ${{ secrets.SYSTEM_LOGGER_CONNECT_SECRET }}
@@ -126,7 +148,7 @@ jobs:
         shell: bash
         if: ${{ !env.ACT }} # Act does not have yq
         run: |
-          make IMG=k8ssandra/cass-operator:${{ steps.vars.outputs.tag_name}} VERSION=${{ env.TARGET_VERSION }} bundle
+          make VERSION=${{ env.TARGET_VERSION }} bundle
       - name: Build and push cass-operator-bundle
         id: docker_build_cass-operator_bundle
         if: ${{ !env.ACT }}
@@ -138,7 +160,9 @@ jobs:
           context: .
           load: true
           push: ${{ !env.ACT }}
-          tags: k8ssandra/cass-operator-bundle:${{ steps.vars.outputs.tag_name}}
+          tags: |
+            k8ssandra/cass-operator-bundle:${{ steps.vars.outputs.tag_name}}
+            us-docker.pkg.dev/k8ssandra/images/cass-operator-bundle:${{ steps.vars.outputs.tag_name}}
           platforms: linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

CHANGELOG.md

@@ -15,6 +15,7 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
 * [CHANGE] [#354](https://github.com/k8ssandra/cass-operator/issues/354) Remove oldDefunctLabel support since we recreate StS. Fix #335 created-by value to match expected value.
 * [CHANGE] [#385](https://github.com/k8ssandra/cass-operator/issues/385) Deprecate CassandraDatacenter's RollingRestartRequested. Use CassandraTask instead.
 * [CHANGE] [#397](https://github.com/k8ssandra/cass-operator/issues/397) Remove direct dependency to k8s.io/kubernetes
+* [CHANGE] [#414](https://github.com/k8ssandra/cass-operator/issues/414) Use new artifacts.k8ssandra.io repository for pulling images.
 * [FEATURE] [#384](https://github.com/k8ssandra/cass-operator/issues/384) Add a new CassandraTask operation "replacenode" that removes the existing PVCs from the pod, deletes the pod and starts a replacement process.
 * [FEATURE] [#387](https://github.com/k8ssandra/cass-operator/issues/387) Add a new CassandraTask operation "upgradesstables" that allows to do SSTable upgrades after Cassandra version upgrade.
 * [ENHANCEMENT] [#385](https://github.com/k8ssandra/cass-operator/issues/385) Add rolling restart as a CassandraTask action.

Makefile

@@ -39,9 +39,9 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # This variable is used to construct full image tags for bundle and catalog images.
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# cassandra.datastax.com/cass-oper-bundle:$VERSION and cassandra.datastax.com/cass-oper-catalog:$VERSION.
+# k8ssandra/cass-operator-bundle:$VERSION and k8ssandra/cass-operator-catalog:$VERSION.
 
-ORG ?= k8ssandra
+ORG ?= us-docker.pkg.dev/k8ssandra/images
 IMAGE_TAG_BASE ?= $(ORG)/cass-operator
 
 M_INTEG_DIR ?= all
@@ -161,7 +161,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.
-	docker buildx build --build-arg VERSION=${VERSION} -t ${IMG} -t ${IMG_LATEST} . --load
+    docker buildx build --build-arg VERSION=${VERSION} -t ${IMG} -t k8ssandra/cass-operator:v${VERSION} -t ${IMG_LATEST} -t k8ssandra/cass-operator:latest . --load
 
 .PHONY: docker-kind
 docker-kind: docker-build ## Build docker image and load to kind cluster
@@ -172,15 +172,19 @@ docker-kind: docker-build ## Build docker image and load to kind cluster
 docker-push: ## Build and push docker image with the manager.
 	docker push ${IMG}
 	docker push ${IMG_LATEST}
+	docker push k8ssandra/cass-operator:v${VERSION}
+	docker push k8ssandra/cass-operator:latest
 
 .PHONY: docker-logger-build
 docker-logger-build: ## Build system-logger image.
-	docker buildx build -t ${LOG_IMG} -t ${LOG_IMG_LATEST} --build-arg VERSION=${VERSION} -f logger.Dockerfile . --load
+    docker buildx build -t ${LOG_IMG} -t ${LOG_IMG_LATEST} --build-arg VERSION=${VERSION} -t k8ssandra/system-logger:v${VERSION} -t k8ssandra/system-logger:latest -f logger.Dockerfile . --load
 
 .PHONY: docker-logger-push
 docker-logger-push: ## Push system-logger-image
 	docker push ${LOG_IMG}
 	docker push ${LOG_IMG_LATEST}
+	docker push k8ssandra/system-logger:v${VERSION}
+	docker push k8ssandra/system-logger:latest
 
 .PHONY: docker-logger-kind
 docker-logger-kind: docker-logger-build ## Build system-logger image and load to kind cluster
@@ -313,11 +317,12 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.
-	docker buildx build -f bundle.Dockerfile -t $(BUNDLE_IMG) . --load
+	docker buildx build -f bundle.Dockerfile -t $(BUNDLE_IMG) -t k8ssandra/cass-operator-bundle:v$(VERSION) . --load
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
 	docker push $(BUNDLE_IMG)
+	docker push k8ssandra/cass-operator-bundle:v$(VERSION)
 
 .PHONY: opm
 OPM = ./bin/opm
@@ -354,8 +359,10 @@ endif
 .PHONY: catalog-build
 catalog-build: opm ## Build a catalog image.
 	$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
+	docker tag $(CATALOG_IMG) k8ssandra/cass-operator-catalog:v$(VERSION)
 
 # Push the catalog image.
 .PHONY: catalog-push
 catalog-push: ## Push a catalog image.
 	docker push $(CATALOG_IMG)
+	docker push k8ssandra/cass-operator-catalog:v$(VERSION)

config/manager/image_config.yaml

@@ -3,7 +3,7 @@ kind: ImageConfig
 metadata:
   name: image-config
 images:
-  system-logger: "k8ssandra/system-logger:latest"
+  system-logger: "artifacts.k8ssandra.io/k8ssandra/images/system-logger:latest"
   config-builder: "datastax/cass-config-builder:1.0.4-ubi7"
   # cassandra:
   #   "4.0.0": "k8ssandra/cassandra-ubi:latest"
@@ -16,7 +16,7 @@ images:
 defaults:
   # Note, postfix is ignored if repository is not set
   cassandra:
-    repository: "k8ssandra/cass-management-api"
+    repository: "artifacts.k8ssandra.io/k8ssandra/images/cass-management-api"
   dse:
     repository: "datastax/dse-server"
     suffix: "-ubi7"

config/manager/kustomization.yaml

@@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: k8ssandra/cass-operator
+  newName: us-docker.pkg.dev/k8ssandra/images/cass-operator
   newTag: v1.13.0-dev.0bb3086-20220819

pkg/images/images.go

@@ -25,7 +25,7 @@ var (
 const (
 	ValidDseVersionRegexp      = "6\\.8\\.\\d+"
 	ValidOssVersionRegexp      = "(3\\.11\\.\\d+)|(4\\.\\d+\\.\\d+)"
-	DefaultCassandraRepository = "k8ssandra/cass-management-api"
+	DefaultCassandraRepository = "artifacts.k8ssandra.io/k8ssandra/images/cass-management-api"
 	DefaultDSERepository       = "datastax/dse-server"
 )
 

pkg/images/images_test.go

@@ -36,7 +36,7 @@ func TestCassandraOverride(t *testing.T) {
 
 	cassImage, err := GetCassandraImage("cassandra", "4.0.0")
 	assert.NoError(err, "getting Cassandra image should succeed")
-	assert.Equal("k8ssandra/cass-management-api:4.0.0", cassImage)
+	assert.Equal("artifacts.k8ssandra.io/k8ssandra/images/cass-management-api:4.0.0", cassImage)
 
 	imageConfig.Images.CassandraVersions = map[string]string{
 		"4.0.0": customImageName,
@@ -56,10 +56,10 @@ func TestDefaultImageConfigParsing(t *testing.T) {
 	// Verify some default values are set
 	assert.NotNil(GetImageConfig())
 	assert.NotNil(GetImageConfig().Images)
-	assert.True(strings.HasPrefix(GetImageConfig().Images.SystemLogger, "k8ssandra/system-logger:"))
+	assert.True(strings.HasPrefix(GetImageConfig().Images.SystemLogger, "artifacts.k8ssandra.io/k8ssandra/images/system-logger:"))
 	assert.True(strings.HasPrefix(GetImageConfig().Images.ConfigBuilder, "datastax/cass-config-builder:"))
 
-	assert.Equal("k8ssandra/cass-management-api", GetImageConfig().DefaultImages.CassandraImageComponent.Repository)
+	assert.Equal("artifacts.k8ssandra.io/k8ssandra/images/cass-management-api", GetImageConfig().DefaultImages.CassandraImageComponent.Repository)
 	assert.Equal("datastax/dse-server", GetImageConfig().DefaultImages.DSEImageComponent.Repository)
 
 	path, err := GetCassandraImage("dse", "6.8.17")
@@ -76,10 +76,10 @@ func TestImageConfigParsing(t *testing.T) {
 	// Verify some default values are set
 	assert.NotNil(GetImageConfig())
 	assert.NotNil(GetImageConfig().Images)
-	assert.True(strings.HasPrefix(GetImageConfig().Images.SystemLogger, "k8ssandra/system-logger:"))
+	assert.True(strings.HasPrefix(GetImageConfig().Images.SystemLogger, "artifacts.k8ssandra.io/k8ssandra/images/system-logger:"))
 	assert.True(strings.HasPrefix(GetImageConfig().Images.ConfigBuilder, "datastax/cass-config-builder:"))
 
-	assert.Equal("k8ssandra/cass-management-api", GetImageConfig().DefaultImages.CassandraImageComponent.Repository)
+	assert.Equal("artifacts.k8ssandra.io/k8ssandra/images/cass-management-api", GetImageConfig().DefaultImages.CassandraImageComponent.Repository)
 	assert.Equal("datastax/dse-server", GetImageConfig().DefaultImages.DSEImageComponent.Repository)
 
 	assert.Equal("localhost:5000", GetImageConfig().ImageRegistry)
@@ -106,7 +106,7 @@ func TestDefaultRepositories(t *testing.T) {
 
 	path, err := GetCassandraImage("cassandra", "4.0.1")
 	assert.NoError(err)
-	assert.Equal("k8ssandra/cass-management-api:4.0.1", path)
+	assert.Equal("artifacts.k8ssandra.io/k8ssandra/images/cass-management-api:4.0.1", path)
 
 	path, err = GetCassandraImage("dse", "6.8.17")
 	assert.NoError(err)