Skip to content

Migrate docker & nginx bot credentials to Azure Vault #8530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Migrate docker & nginx bot credentials to Azure Vault #8530

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9b71df
Migrate docker credentials to Azure Vault
pdabelf5 Nov 12, 2025
8f3e1bf
Migrate nginx pat to Azure Vault
pdabelf5 Nov 12, 2025
b3720bd
Merge branch 'main' into chore/vault-docker
pdabelf5 Nov 12, 2025
7d885ad
Merge branch 'main' into chore/vault-docker
pdabelf5 Nov 12, 2025
ba13ff9
helm publish needs id-token permissions
pdabelf5 Nov 12, 2025
6e414a2
Merge branch 'chore/vault-docker' of github.com:nginx/kubernetes-ingr…
pdabelf5 Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions .github/workflows/build-oss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,26 @@ jobs:
ref: ${{ inputs.branch }}
fetch-depth: 0

- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_COMMON_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_COMMON_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_COMMON_VAULT_SUBSCRIPTION_ID }}
if: ${{ inputs.authenticated }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
DOCKER_USERNAME=$(az keyvault secret show --name docker-username --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$DOCKER_USERNAME"
echo "DOCKER_USERNAME=$DOCKER_USERNAME" >> $GITHUB_OUTPUT
DOCKER_PASSWORD=$(az keyvault secret show --name docker-password --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$DOCKER_PASSWORD"
echo "DOCKER_PASSWORD=$DOCKER_PASSWORD" >> $GITHUB_OUTPUT
if: ${{ inputs.authenticated }}

- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
Expand All @@ -81,8 +101,8 @@ jobs:
- name: DockerHub Login
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ steps.secrets.outputs.DOCKER_USERNAME }}
password: ${{ steps.secrets.outputs.DOCKER_PASSWORD }}
if: ${{ inputs.authenticated }}

- name: Docker meta
Expand Down
24 changes: 22 additions & 2 deletions .github/workflows/build-plus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,26 @@ jobs:
ref: ${{ inputs.branch }}
fetch-depth: 0

- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_COMMON_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_COMMON_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_COMMON_VAULT_SUBSCRIPTION_ID }}
if: ${{ inputs.authenticated }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
DOCKER_USERNAME=$(az keyvault secret show --name docker-username --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$DOCKER_USERNAME"
echo "DOCKER_USERNAME=$DOCKER_USERNAME" >> $GITHUB_OUTPUT
DOCKER_PASSWORD=$(az keyvault secret show --name docker-password --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$DOCKER_PASSWORD"
echo "DOCKER_PASSWORD=$DOCKER_PASSWORD" >> $GITHUB_OUTPUT
if: ${{ inputs.authenticated }}

- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
Expand All @@ -83,8 +103,8 @@ jobs:
- name: DockerHub Login
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ steps.secrets.outputs.DOCKER_USERNAME }}
password: ${{ steps.secrets.outputs.DOCKER_PASSWORD }}
if: ${{ inputs.authenticated }}

- name: NAP modules
Expand Down
18 changes: 17 additions & 1 deletion .github/workflows/cherry-pick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
permissions:
contents: write
pull-requests: write
id-token: write
runs-on: ubuntu-24.04
name: Cherry pick into release branch
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry pick') && github.event.pull_request.merged == true }}
Expand All @@ -31,10 +32,25 @@ jobs:
echo "branch=${release_branch}" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT

- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_COMMON_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_COMMON_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_COMMON_VAULT_SUBSCRIPTION_ID }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
NGINX_PAT=$(az keyvault secret show --name nginx-bot-pat --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$NGINX_PAT"
echo "NGINX_PAT=$NGINX_PAT" >> $GITHUB_OUTPUT

- name: Cherry pick into ${{ steps.branch.outputs.branch }}
uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
with:
branch: ${{ steps.branch.outputs.branch }}
token: ${{ secrets.NGINX_PAT }}
token: ${{ steps.secrets.outputs.NGINX_PAT }}
author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
title: "[cherry-pick] {old_title}"
18 changes: 17 additions & 1 deletion .github/workflows/create-release-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,28 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write
steps:
- name: Checkout NIC repo
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
ref: ${{ inputs.source_branch }}

- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_COMMON_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_COMMON_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_COMMON_VAULT_SUBSCRIPTION_ID }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
NGINX_PAT=$(az keyvault secret show --name nginx-bot-pat --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$NGINX_PAT"
echo "NGINX_PAT=$NGINX_PAT" >> $GITHUB_OUTPUT

- name: Create new release branch
run: |
branch="${{ inputs.branch_prefix }}${{ inputs.release_version }}"
Expand All @@ -66,4 +82,4 @@ jobs:
git push --dry-run origin "${branch}"
fi
env:
GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}
GITHUB_TOKEN: ${{ steps.secrets.outputs.NGINX_PAT }}
25 changes: 23 additions & 2 deletions .github/workflows/dockerhub-description.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ permissions:
jobs:
dockerHubDescription:
runs-on: ubuntu-24.04
permissions:
contents: read
id-token: write
if: ${{ github.event.repository.fork == false }}
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
Expand All @@ -25,10 +28,28 @@ jobs:
run: |
sed -i '3,4d' README.md
- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_COMMON_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_COMMON_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_COMMON_VAULT_SUBSCRIPTION_ID }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
DOCKER_USERNAME=$(az keyvault secret show --name docker-username --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$DOCKER_USERNAME"
echo "DOCKER_USERNAME=$DOCKER_USERNAME" >> $GITHUB_OUTPUT
DOCKER_PASSWORD=$(az keyvault secret show --name docker-password --vault-name ${{ secrets.COMMON_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$DOCKER_PASSWORD"
echo "DOCKER_PASSWORD=$DOCKER_PASSWORD" >> $GITHUB_OUTPUT
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
username: ${{ steps.secrets.outputs.DOCKER_USERNAME }}
password: ${{ steps.secrets.outputs.DOCKER_PASSWORD }}
repository: nginx/nginx-ingress
short-description: ${{ github.event.repository.description }}
Loading
Loading