From bbeb5087380b8719086eaba96b0ccb064416860e Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Thu, 6 Mar 2025 15:36:34 +0100 Subject: [PATCH] fix(actions): standardize registry URL in workflows Replace all instances of RELEASE_OSS_REGISTRY secret with the already defined IMAGE_REGISTRY_URL environment variable for consistency across deployment steps. This eliminates duplicate references to the same registry URL and simplifies future maintenance. Signed-off-by: rjshrjndrn --- .github/workflows/release-deployment.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-deployment.yaml b/.github/workflows/release-deployment.yaml index 5bf617502..39c89e689 100644 --- a/.github/workflows/release-deployment.yaml +++ b/.github/workflows/release-deployment.yaml @@ -15,7 +15,6 @@ env: IMAGE_REGISTRY_URL: ${{ secrets.OSS_REGISTRY_URL }} DEPOT_PROJECT_ID: ${{ secrets.DEPOT_PROJECT_ID }} DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }} - DOCKER_REPO_OSS: ${{ secrets.OSS_REGISTRY_URL }} jobs: deploy: @@ -27,7 +26,7 @@ jobs: ref: ${{ github.event.inputs.branch }} - name: Docker login run: | - docker login ${{ secrets.OSS_REGISTRY_URL }} -u ${{ secrets.OSS_DOCKER_USERNAME }} -p "${{ secrets.OSS_REGISTRY_TOKEN }}" + docker login $IMAGE_REGISTRY_URL -u ${{ secrets.OSS_DOCKER_USERNAME }} -p "${{ secrets.OSS_REGISTRY_TOKEN }}" - name: Set image tag with branch info run: | @@ -73,8 +72,7 @@ jobs: for SERVICE in "${SERVICES[@]}"; do SERVICE=$(echo $SERVICE | xargs) # Trim whitespace echo "Deploying $SERVICE to EE cluster with image tag: ${IMAGE_TAG}" - kubectl set image deployment/$SERVICE-openreplay -n app $SERVICE=${{ secrets.RELEASE_OSS_REGISTRY }}/$SERVICE:${IMAGE_TAG} - done + kubectl set image deployment/$SERVICE-openreplay -n app $SERVICE=${IMAGE_REGISTRY_URL}/$SERVICE:${IMAGE_TAG} - uses: azure/k8s-set-context@v1 name: Using foss release cluster @@ -89,5 +87,5 @@ jobs: for SERVICE in "${SERVICES[@]}"; do SERVICE=$(echo $SERVICE | xargs) # Trim whitespace echo "Deploying $SERVICE to FOSS cluster with image tag: ${IMAGE_TAG}" - kubectl set image deployment/$SERVICE-openreplay -n app $SERVICE=${{ secrets.RELEASE_OSS_REGISTRY }}/$SERVICE:${IMAGE_TAG} - done + echo "Deploying $SERVICE to FOSS cluster with image tag: ${IMAGE_TAG}" + kubectl set image deployment/$SERVICE-openreplay -n app $SERVICE=${IMAGE_REGISTRY_URL}/$SERVICE:${IMAGE_TAG}