Fix registry setup

k3s-io · Sep 8, 2023 · 9ab228d · 9ab228d
1 parent c146edc
commit 9ab228d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -50,7 +50,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.target }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.target }}-controller
           flavor: latest=false
           tags: type=ref,event=tag
 
@@ -120,8 +120,8 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-controlplane
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-bootstrap
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-controlplane-controller
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-bootstrap-controller
           flavor: latest=false
           tags: type=ref,event=tag
 

diff --git a/Makefile b/Makefile
@@ -110,13 +110,15 @@ $(RELEASE_DIR):
 $(RELEASE_NOTES_DIR):
 	mkdir -p $(RELEASE_NOTES_DIR)/
 
+REGISTRY ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s
+
 # Image URL to use all building/pushing image targets
 BOOTSTRAP_IMG_TAG ?= $(RELEASE_TAG)
-BOOTSTRAP_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/bootstrap-controller:$(BOOTSTRAP_IMG_TAG)
+BOOTSTRAP_IMG ?= $(REGISTRY)/bootstrap-controller:$(BOOTSTRAP_IMG_TAG)
 
 # Image URL to use all building/pushing image targets
 CONTROLPLANE_IMG_TAG ?= $(RELEASE_TAG)
-CONTROLPLANE_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller:$(CONTROLPLANE_IMG_TAG)
+CONTROLPLANE_IMG ?= $(REGISTRY)/controlplane-controller:$(CONTROLPLANE_IMG_TAG)
 
 all-bootstrap: manager-bootstrap