Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/certify-openshift-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ inputs:
required: false
default: "amd64,arm64"
submit:
description: Submit results to Redhat PYAXIS
description: Submit results to Redhat PYXIS
required: false
default: true

Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/build-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GOPATH: ${{ inputs.go-path }}
GOPROXY: ${{ inputs.go-proxy }}
AWS_PRODUCT_CODE: ${{ secrets.AWS_PRODUCT_CODE }}
AWS_PUB_KEY: ${{ secrets.AWS_PUB_KEY }}
AWS_NAP_DOS_PRODUCT_CODE: ${{ secrets.AWS_NAP_DOS_PRODUCT_CODE }}
AWS_NAP_DOS_PUB_KEY: ${{ secrets.AWS_NAP_DOS_PUB_KEY }}
AWS_NAP_WAF_PRODUCT_CODE: ${{ secrets.AWS_NAP_WAF_PRODUCT_CODE }}
AWS_NAP_WAF_PUB_KEY: ${{ secrets.AWS_NAP_WAF_PUB_KEY }}
AWS_NAP_WAF_DOS_PRODUCT_CODE: ${{ secrets.AWS_NAP_WAF_DOS_PRODUCT_CODE }}
AWS_NAP_WAF_DOS_PUB_KEY: ${{ secrets.AWS_NAP_WAF_DOS_PUB_KEY }}
GORELEASER_CURRENT_TAG: "v${{ inputs.ic-version }}"
if: ${{ inputs.force }}

Expand All @@ -115,6 +107,10 @@ jobs:
key: nginx-ingress-${{ inputs.go-md5 }}
if: ${{ inputs.force }}

- name: Cleanup netrc
run: rm -f $HOME/.netrc
if: ${{ always() }}

# generate-assertion-doc:
# if: ${{ github.event_name != 'pull_request' }}
# name: Assertion Doc ${{ matrix.nic.arch }}
Expand Down Expand Up @@ -190,9 +186,9 @@ jobs:
# with:
# assertion-doc: ${{ steps.assertiondoc.outputs.assertion-document-path }}

- name: Cleanup netrc
run: rm -f $HOME/.netrc
if: ${{ always() }}
- name: Cleanup netrc
# run: rm -f $HOME/.netrc
# if: ${{ always() }}

build-docker:
name: Build Docker OSS
Expand Down
25 changes: 23 additions & 2 deletions .github/workflows/certify-ubi-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,37 @@ jobs:
certify-ubi-images:
name: Certify OpenShift UBI images
runs-on: ubuntu-24.04
permissions:
contents: read
id-token: write
steps:
- name: Checkout
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
PYXIS_TOKEN=$(az keyvault secret show --name nic-pyxis-token --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$PYXIS_TOKEN"
echo "PYXIS_TOKEN=$PYXIS_TOKEN" >> $GITHUB_OUTPUT
PYXIS_CERTIFICATION_PROJECT_ID=$(az keyvault secret show --name nic-pyxis-certification-pid --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$PYXIS_CERTIFICATION_PROJECT_ID"
echo "PYXIS_CERTIFICATION_PROJECT_ID=$PYXIS_CERTIFICATION_PROJECT_ID" >> $GITHUB_OUTPUT

- name: Certify UBI OSS images in quay
uses: ./.github/actions/certify-openshift-image
with:
image: ${{ inputs.image }}
project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }}
pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
project_id: ${{ steps.secrets.outputs.PYXIS_CERTIFICATION_PROJECT_ID }}
pyxis_token: ${{ steps.secrets.outputs.PYXIS_TOKEN }}
preflight_version: ${{ inputs.preflight_version }}
submit: ${{ inputs.submit || true }}
platforms: ${{ inputs.platforms }}
21 changes: 20 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,25 @@ jobs:
with:
version: 'v3.18.6'

- name: Azure login
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
with:
client-id: ${{ secrets.AZURE_VAULT_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_VAULT_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}
if: ${{ needs.checks.outputs.forked_workflow != 'true' }}

- name: Setup secrets
id: secrets
run: |
echo "Setting secrets for job"
PLUS_CREDS=$(az keyvault secret show --name plus-creds --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
echo "::add-mask::$PLUS_CREDS"
PLUS_JWT=$(echo $PLUS_CREDS | jq -r '.jwt')
echo "::add-mask::$PLUS_JWT"
echo "PLUS_JWT=$PLUS_JWT" >> $GITHUB_OUTPUT
if: ${{ needs.checks.outputs.forked_workflow != 'true' }}

- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
Expand Down Expand Up @@ -505,7 +524,7 @@ jobs:
if: ${{ steps.stable_exists.outputs.exists != 'true' && needs.checks.outputs.docs_only == 'false' }}

- name: Create Plus Secret
run: kubectl create secret generic license-token --from-literal=license.jwt="${{ secrets.PLUS_JWT }}" --type="nginx.com/license"
run: kubectl create secret generic license-token --from-literal=license.jwt="${{ steps.secrets.outputs.PLUS_JWT }}" --type="nginx.com/license"
if: ${{ matrix.type == 'plus' && steps.stable_exists.outputs.exists != 'true' && needs.checks.outputs.docs_only == 'false' }}

- name: Install Chart
Expand Down
Loading