Merge branch 'chore/vault-docker' of github.com:nginx/kubernetes-ingress into chore/vault-docker

Author: pdabelf5

.github/actions/smoke-tests/action.yaml

@@ -28,9 +28,6 @@ inputs:
   label:
     description: Label for test
     required: false
-  azure-ad-secret:
-    description: Azure Active Directory secret for JWKs
-    required: false
   registry-token:
     description: JWT token for accessing container registry
     required: false
@@ -103,7 +100,6 @@ runs:
         --self-contained-html \
         --durations=10 \
         --show-ic-logs=yes \
-        --ad-secret=${{ inputs.azure-ad-secret }} \
         --plus-jwt=${{ inputs.plus-jwt }} \
         -m ${{ inputs.marker != '' && inputs.marker || '""' }}
       working-directory: ./tests

.github/workflows/regression.yml

@@ -288,7 +288,6 @@ jobs:
           marker: ${{ matrix.images.marker != '' && matrix.images.marker || '' }}
           k8s-version: ${{ matrix.k8s }}
           label: ${{ matrix.images.label }}
-          azure-ad-secret: ${{ secrets.AZURE_AD_AUTOMATION }}
           registry-token: ${{ steps.auth.outputs.access_token }}
           test-image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/test-runner:${{ hashFiles('./tests/requirements.txt', './tests/Dockerfile') || 'latest' }}"
           plus-jwt: ${{ secrets.PLUS_JWT }}

.github/workflows/setup-smoke.yml

@@ -165,7 +165,6 @@ jobs:
           marker: ${{ inputs.marker != '' && inputs.marker || '' }}
           label: ${{ inputs.label }}
           k8s-version: ${{ inputs.k8s-version }}
-          azure-ad-secret: ${{ secrets.AZURE_AD_AUTOMATION }}
           registry-token: ${{ steps.auth.outputs.access_token }}
           test-image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/test-runner:${{ hashFiles('./tests/requirements.txt', './tests/Dockerfile') || 'latest' }}"
           plus-jwt: ${{ secrets.PLUS_JWT }}

.github/workflows/single-image-regression.yml

@@ -120,7 +120,6 @@ jobs:
           marker: ${{ inputs.marker }}
           label: "${{ inputs.image }} regression"
           k8s-version: ${{ inputs.k8s-version }}
-          azure-ad-secret: ${{ secrets.AZURE_AD_AUTOMATION }}
           registry-token: ${{ steps.auth.outputs.access_token }}
           test-image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/test-runner:${{ hashFiles('./tests/requirements.txt', './tests/Dockerfile') }}"
           plus-jwt: ${{ secrets.PLUS_JWT }}

tests/Makefile

@@ -22,7 +22,6 @@ K8S_CLUSTER_NAME            ?= local ## The name used when creating/using a Kin
 # renovate: datasource=docker depName=kindest/node
 K8S_CLUSTER_VERSION         ?= v1.34.0
 K8S_TIMEOUT                 ?= 75s ## The timeout used when creating a Kind Kubernetes cluster
-AD_SECRET                   ?=
 PLUS_JWT                    ?=
 PYTEST_ARGS                 ?=
 ifeq (${REGISTRY},)

tests/conftest.py

@@ -120,12 +120,6 @@ def pytest_addoption(parser) -> None:
         default=NS_COUNT,
         help="Number for namespaces to deploy for use in test_multiple_ns_perf.py",
     )
-    parser.addoption(
-        "--ad-secret",
-        action="store",
-        default=os.environ.get("AZURE_AD_AUTOMATION"),
-        help="Azure active directory secret for JWKs",
-    )
     parser.addoption(
         "--num",
         action="store",