From b167ee165ddd00f387fb1d324063ad432cf992fe Mon Sep 17 00:00:00 2001
From: Rafael <32229014+rafaelbreno@users.noreply.github.com>
Date: Thu, 8 Jan 2026 14:46:19 -0300
Subject: [PATCH] Push GA images to staging registry (#13438)

Signed-off-by: Rafael Breno <rafael_breno@outlook.com>
---
 .github/workflows/release.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 374e78b4ba7..9d27f63e4ef 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,16 +53,16 @@ jobs:
 
       - name: Read registry secrets (staging)
         uses: rancher-eio/read-vault-secrets@main
-        if: ${{ github.event.release.prerelease && github.repository_owner == 'k3s-io' }}
+        if: ${{ github.repository_owner == 'k3s-io' }}
         with:
           secrets: |
-            secret/data/github/repo/${{ github.repository }}/k3s-suse-registry-stg/credentials registry | REGISTRY ;
-            secret/data/github/repo/${{ github.repository }}/k3s-suse-registry-stg/credentials username | REGISTRY_USERNAME ;
-            secret/data/github/repo/${{ github.repository }}/k3s-suse-registry-stg/credentials password | REGISTRY_PASSWORD
+            secret/data/github/repo/${{ github.repository }}/k3s-suse-registry-stg/credentials registry | STAGING_REGISTRY ;
+            secret/data/github/repo/${{ github.repository }}/k3s-suse-registry-stg/credentials username | STAGING_REGISTRY_USERNAME ;
+            secret/data/github/repo/${{ github.repository }}/k3s-suse-registry-stg/credentials password | STAGING_REGISTRY_PASSWORD
 
       - name: Read registry secrets (prime)
         uses: rancher-eio/read-vault-secrets@main
-        if: ${{ ! github.event.release.prerelease && github.repository_owner == 'k3s-io' }}
+        if: ${{ !contains(github.ref_name, '-rc') && github.repository_owner == 'k3s-io' }}
         with:
           secrets: |
             secret/data/github/repo/${{ github.repository }}/k3s-suse-registry/credentials registry | REGISTRY ;
@@ -92,9 +92,17 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Login to Prime Registry
+      - name: Login to Staging Registry
         if: github.repository_owner == 'k3s-io'
         uses: docker/login-action@v3
+        with:
+          registry: ${{ env.STAGING_REGISTRY }}
+          username: ${{ env.STAGING_REGISTRY_USERNAME }}
+          password: ${{ env.STAGING_REGISTRY_PASSWORD }}
+
+      - name: Login to Prime Registry
+        if: ${{ !contains(github.ref_name, '-rc') && github.repository_owner == 'k3s-io' }}
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ env.REGISTRY_USERNAME }}
@@ -140,7 +148,8 @@ jobs:
           images: |
             ghcr.io/${{ github.repository_owner }}/k3s
             docker.io/${{ env.DOCKERHUB_ORG }}/k3s
-            ${{ env.REGISTRY }}/rancher/k3s
+            name=${{ env.REGISTRY }}/rancher/k3s,enable=${{ !contains(github.ref_name, '-rc') && github.repository_owner == 'k3s-io' }}
+            name=${{ env.STAGING_REGISTRY }}/rancher/k3s,enable=${{ github.repository_owner == 'k3s-io' }}
           flavor: latest=false
           tags: ${{ steps.tag_config.outputs.tag_spec }}