Skip to content

Commit 7b48a4c

Browse files
committed
update CI for rke extended life
1 parent cb0e4e1 commit 7b48a4c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.github/workflows/release.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
uses: rancher-eio/read-vault-secrets@main
2424
with:
2525
secrets: |
26-
secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials endpoint | REGISTRY_ENDPOINT ;
27-
secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials username | REGISTRY_USERNAME ;
28-
secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials password | REGISTRY_PASSWORD
26+
secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials endpoint | STAGE_REGISTRY_ENDPOINT;
27+
secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials username | STAGE_REGISTRY_USERNAME;
28+
secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials password | STAGE_REGISTRY_PASSWORD;
2929
- name: Setup Environment Variables
3030
run: |
3131
echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV"
3232
echo "K8S_VERSION=$( echo ${{ github.ref_name }} | tr -s " " | cut -d "-" -f1 )" >> "$GITHUB_ENV"
33-
echo "IMAGE=${REGISTRY_ENDPOINT}/rancher/rke-extended-life/hyperkube" >> "$GITHUB_ENV"
33+
echo "IMAGE=${STAGE_REGISTRY_ENDPOINT}/rke-extended-life/hyperkube" >> "$GITHUB_ENV"
3434
- name: Logout from Docker registry
35-
run: docker logout ${{ env.REGISTRY_ENDPOINT }} || true
35+
run: docker logout ${{ env.STAGE_REGISTRY_ENDPOINT }} || true
3636
- name: Prepare binaries
3737
run: make k8s-binaries
3838
- name: Docker meta
@@ -49,9 +49,9 @@ jobs:
4949
- name: Login to Docker Hub
5050
uses: docker/login-action@v3
5151
with:
52-
registry: ${{ env.REGISTRY_ENDPOINT }}
53-
username: ${{ env.REGISTRY_USERNAME }}
54-
password: ${{ env.REGISTRY_PASSWORD }}
52+
registry: ${{ env.STAGE_REGISTRY_ENDPOINT }}
53+
username: ${{ env.STAGE_REGISTRY_USERNAME }}
54+
password: ${{ env.STAGE_REGISTRY_PASSWORD }}
5555
- name: Build and push Docker image
5656
id: build
5757
uses: docker/build-push-action@v5
@@ -95,13 +95,13 @@ jobs:
9595
uses: rancher-eio/read-vault-secrets@main
9696
with:
9797
secrets: |
98-
secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials endpoint | REGISTRY_ENDPOINT ;
99-
secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials username | REGISTRY_USERNAME ;
100-
secret/data/github/repo/${{ github.repository }}/prime-registry/rancher/rke-extended-life/credentials password | REGISTRY_PASSWORD
98+
secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials endpoint | STAGE_REGISTRY_ENDPOINT;
99+
secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials username | STAGE_REGISTRY_USERNAME;
100+
secret/data/github/repo/${{ github.repository }}/stage-registry/rancher/rke-extended-life/credentials password | STAGE_REGISTRY_PASSWORD;
101101
- name: Set IMAGE with registry endpoint
102-
run: echo "IMAGE=${REGISTRY_ENDPOINT}/rancher/rke-extended-life/hyperkube" >> "$GITHUB_ENV"
102+
run: echo "IMAGE=${STAGE_REGISTRY_ENDPOINT}/rke-extended-life/hyperkube" >> "$GITHUB_ENV"
103103
- name: Logout from Docker registry
104-
run: docker logout ${{ env.REGISTRY_ENDPOINT }} || true
104+
run: docker logout ${{ env.STAGE_REGISTRY_ENDPOINT }} || true
105105
- name: Docker meta
106106
id: meta
107107
uses: docker/metadata-action@v5
@@ -112,9 +112,9 @@ jobs:
112112
- name: Login to Docker Hub
113113
uses: docker/login-action@v3
114114
with:
115-
registry: ${{ env.REGISTRY_ENDPOINT }}
116-
username: ${{ env.REGISTRY_USERNAME }}
117-
password: ${{ env.REGISTRY_PASSWORD }}
115+
registry: ${{ env.STAGE_REGISTRY_ENDPOINT }}
116+
username: ${{ env.STAGE_REGISTRY_USERNAME }}
117+
password: ${{ env.STAGE_REGISTRY_PASSWORD }}
118118
- name: Create manifest list and push
119119
working-directory: /tmp/digests
120120
run: |

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
K8S_VERSION?=v1.32.5
1+
K8S_VERSION?=v1.32.6
22

33
ARCH?=amd64
44
ALL_ARCH=amd64 arm64

0 commit comments

Comments
 (0)