From 843ccedaa84f27bb881437ad729ed7bbf071153c Mon Sep 17 00:00:00 2001 From: vivekr-splunk Date: Fri, 13 Oct 2023 09:32:10 -0700 Subject: [PATCH 1/2] hardcoding few azure cluster creation Signed-off-by: vivekr-splunk --- .github/workflows/int-test-azure-workflow.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index f4e8d1451..e9847c4f0 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -4,6 +4,7 @@ on: branches: - develop - main + - azure-last-changes jobs: build-operator-image: runs-on: ubuntu-latest @@ -34,8 +35,10 @@ jobs: uses: azure/docker-login@v1 with: login-server: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }} - password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }} + #username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }} + #password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }} + username: ${{ secrets.AZURE_ACR_DOCKER_USERNAME }} + password: ${{ secrets.AZURE_ACR_DOCKER_PASSWORD }} - name: Make Splunk Operator Image run: | make docker-build IMG=${{ secrets.AZURE_ACR_LOGIN_SERVER }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA @@ -171,8 +174,10 @@ jobs: uses: azure/docker-login@v1 with: login-server: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }} - password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }} + #username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }} + #password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }} + username: ${{ secrets.AZURE_ACR_DOCKER_USERNAME }} + password: ${{ secrets.AZURE_ACR_DOCKER_PASSWORD }} - name: Pull Splunk Operator Image Locally run: | docker pull ${{ secrets.AZURE_ACR_LOGIN_SERVER }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA From 43cca8926c285d7f7f9036a0b5ee3052f51f780c Mon Sep 17 00:00:00 2001 From: vivekr-splunk Date: Fri, 13 Oct 2023 11:40:38 -0700 Subject: [PATCH 2/2] remove commented code Signed-off-by: vivekr-splunk --- .github/workflows/int-test-azure-workflow.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index e9847c4f0..8ea1f6c85 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -4,7 +4,6 @@ on: branches: - develop - main - - azure-last-changes jobs: build-operator-image: runs-on: ubuntu-latest @@ -35,8 +34,6 @@ jobs: uses: azure/docker-login@v1 with: login-server: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - #username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }} - #password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }} username: ${{ secrets.AZURE_ACR_DOCKER_USERNAME }} password: ${{ secrets.AZURE_ACR_DOCKER_PASSWORD }} - name: Make Splunk Operator Image @@ -174,8 +171,6 @@ jobs: uses: azure/docker-login@v1 with: login-server: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - #username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }} - #password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }} username: ${{ secrets.AZURE_ACR_DOCKER_USERNAME }} password: ${{ secrets.AZURE_ACR_DOCKER_PASSWORD }} - name: Pull Splunk Operator Image Locally