diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 67ea02f..beced10 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,16 +23,14 @@ jobs: uses: rancher-eio/read-vault-secrets@main with: secrets: | - secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials endpoint | REGISTRY_ENDPOINT ; - secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials username | REGISTRY_USERNAME ; - secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials password | REGISTRY_PASSWORD + secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials endpoint | STAGE_REGISTRY_ENDPOINT; + secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials username | STAGE_REGISTRY_USERNAME; + secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials password | STAGE_REGISTRY_PASSWORD; - name: Setup Environment Variables run: | echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV" echo "K8S_VERSION=$( echo ${{ github.ref_name }} | tr -s " " | cut -d "-" -f1 )" >> "$GITHUB_ENV" - echo "IMAGE=${REGISTRY_ENDPOINT}/rancher/rke-extended-life/hyperkube" >> "$GITHUB_ENV" - - name: Logout from Docker registry - run: docker logout ${{ env.REGISTRY_ENDPOINT }} || true + echo "IMAGE=${STAGE_REGISTRY_ENDPOINT}/rke-extended-life/hyperkube" >> "$GITHUB_ENV" - name: Prepare binaries run: make k8s-binaries - name: Docker meta @@ -49,9 +47,9 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY_ENDPOINT }} - username: ${{ env.REGISTRY_USERNAME }} - password: ${{ env.REGISTRY_PASSWORD }} + registry: ${{ env.STAGE_REGISTRY_ENDPOINT }} + username: ${{ env.STAGE_REGISTRY_USERNAME }} + password: ${{ env.STAGE_REGISTRY_PASSWORD }} - name: Build and push Docker image id: build uses: docker/build-push-action@v5 @@ -95,13 +93,11 @@ jobs: uses: rancher-eio/read-vault-secrets@main with: secrets: | - secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials endpoint | REGISTRY_ENDPOINT ; - secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials username | REGISTRY_USERNAME ; - secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials password | REGISTRY_PASSWORD + secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials endpoint | STAGE_REGISTRY_ENDPOINT; + secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials username | STAGE_REGISTRY_USERNAME; + secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials password | STAGE_REGISTRY_PASSWORD; - name: Set IMAGE with registry endpoint - run: echo "IMAGE=${REGISTRY_ENDPOINT}/rancher/rke-extended-life/hyperkube" >> "$GITHUB_ENV" - - name: Logout from Docker registry - run: docker logout ${{ env.REGISTRY_ENDPOINT }} || true + run: echo "IMAGE=${STAGE_REGISTRY_ENDPOINT}/rke-extended-life/hyperkube" >> "$GITHUB_ENV" - name: Docker meta id: meta uses: docker/metadata-action@v5 @@ -112,9 +108,9 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY_ENDPOINT }} - username: ${{ env.REGISTRY_USERNAME }} - password: ${{ env.REGISTRY_PASSWORD }} + registry: ${{ env.STAGE_REGISTRY_ENDPOINT }} + username: ${{ env.STAGE_REGISTRY_USERNAME }} + password: ${{ env.STAGE_REGISTRY_PASSWORD }} - name: Create manifest list and push working-directory: /tmp/digests run: | diff --git a/Makefile b/Makefile index fd8a88d..68779c9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION?=v1.32.5 +K8S_VERSION?=v1.32.6 ARCH?=amd64 ALL_ARCH=amd64 arm64