@@ -437,11 +437,26 @@ jobs:
437437 # with:
438438 # ref: ${{ inputs.release_branch }}
439439
440+ # - name: Azure login
441+ # uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
442+ # with:
443+ # client-id: ${{ secrets.AZURE_VAULT_CLIENT_ID }}
444+ # tenant-id: ${{ secrets.AZURE_VAULT_TENANT_ID }}
445+ # subscription-id: ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}
446+
447+ # - name: Setup secrets
448+ # id: secrets
449+ # run: |
450+ # echo "Setting secrets for job"
451+ # AWS_ROLE_MARKETPLACE=$(az keyvault secret show --name aws-mktpl-role --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
452+ # echo "::add-mask::$AWS_ROLE_MARKETPLACE"
453+ # echo "AWS_ROLE_MARKETPLACE=$AWS_ROLE_MARKETPLACE" >> $GITHUB_OUTPUT
454+
440455 # - name: Configure AWS Credentials
441456 # uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
442457 # with:
443458 # aws-region: us-east-1
444- # role-to-assume: ${{ secrets.AWS_ROLE_MARKETPLACE }}
459+ # role-to-assume: ${{ steps. secrets.outputs .AWS_ROLE_MARKETPLACE }}
445460
446461 # - name: Publish to AWS Marketplace
447462 # uses: nginx/aws-marketplace-publish@accf7b4c725796b744f2ee27acc2488d76f63d32 # v1.0.8
@@ -527,15 +542,28 @@ jobs:
527542 tenant-id : ${{ secrets.AZURE_TENANT_ID }}
528543 subscription-id : ${{ secrets.AZURE_SUBSCRIPTION_ID }}
529544
545+ - name : Setup secrets
546+ id : secrets
547+ run : |
548+ echo "Setting secrets for job"
549+ AZURE_STORAGE=$(az keyvault secret show --name azure-storage --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
550+ echo "::add-mask::$AZURE_STORAGE"
551+ AZURE_STORAGE_ACCOUNT=$(echo $AZURE_STORAGE | jq -r '.account')
552+ echo "::add-mask::$AZURE_STORAGE_ACCOUNT"
553+ echo "AZURE_STORAGE_ACCOUNT=$AZURE_STORAGE_ACCOUNT" >> $GITHUB_OUTPUT
554+ AZURE_BUCKET_NAME=$(echo $AZURE_STORAGE | jq -r '.bucket')
555+ echo "::add-mask::$AZURE_BUCKET_NAME"
556+ echo "AZURE_BUCKET_NAME=$AZURE_BUCKET_NAME" >> $GITHUB_OUTPUT
557+
530558 - name : Azure Upload Release Packages
531559 uses : azure/CLI@9f7ce6f37c31b777ec6c6b6d1dfe7db79f497956 # v2.2.0
532560 with :
533561 inlineScript : |
534562 for i in $(find tarballs -type f); do
535563 echo -n "Uploading ${i} to kubernetes-ingress/v${{ inputs.nic_version }}/${i##*/} ... "
536564 if ${{ ! inputs.dry_run}}; then
537- az storage blob upload --auth-mode=login -f "$i" -c ${{ secrets.AZURE_BUCKET_NAME }} \
538- --account-name ${{ secrets.AZURE_STORAGE_ACCOUNT }} --overwrite -n kubernetes-ingress/v${{ inputs.nic_version }}/${i##*/}
565+ az storage blob upload --auth-mode=login -f "$i" -c ${{ steps. secrets.outputs .AZURE_BUCKET_NAME }} \
566+ --account-name ${{ steps. secrets.outputs .AZURE_STORAGE_ACCOUNT }} --overwrite -n kubernetes-ingress/v${{ inputs.nic_version }}/${i##*/}
539567 echo "done"
540568 else
541569 echo "skipped, dry_run."
@@ -635,6 +663,7 @@ jobs:
635663 permissions :
636664 contents : read
637665 actions : read
666+ id-token : write
638667 strategy :
639668 fail-fast : false
640669 matrix :
@@ -645,6 +674,21 @@ jobs:
645674 with :
646675 ref : ${{ inputs.release_branch }}
647676
677+ - name : Azure login
678+ uses : azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
679+ with :
680+ client-id : ${{ secrets.AZURE_VAULT_CLIENT_ID }}
681+ tenant-id : ${{ secrets.AZURE_VAULT_TENANT_ID }}
682+ subscription-id : ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}
683+
684+ - name : Setup secrets
685+ id : secrets
686+ run : |
687+ echo "Setting secrets for job"
688+ SLACK_WEBHOOK=$(az keyvault secret show --name slack-pipeline-webhook --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
689+ echo "::add-mask::$SLACK_WEBHOOK"
690+ echo "SLACK_WEBHOOK=$SLACK_WEBHOOK" >> $GITHUB_OUTPUT
691+
648692 - name : Get Image manifest digest
649693 id : digest
650694 run : |
@@ -701,4 +745,4 @@ jobs:
701745 }]
702746 }
703747 env :
704- SLACK_WEBHOOK_URL : ${{ secrets.SLACK_WEBHOOK }}
748+ SLACK_WEBHOOK_URL : ${{ steps. secrets.outputs .SLACK_WEBHOOK }}
0 commit comments