Merge main branch into feat/vsr-route-selector

Author: haywoodsh

.codecov.yml

@@ -14,3 +14,4 @@ coverage:
 ignore:
   - "pkg/client"
   - "**/*generated*.go"
+  - "hack"

.fossa.yml

@@ -4,4 +4,3 @@ targets:
     - type: setuptools
 paths:
   exclude:
-    - site

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -14,6 +14,15 @@ body:
       description: What version of our F5 NGINX Ingress Controller are you running?
       options:
         - edge
+        - 5.2.1
+        - 5.2.0
+        - 5.1.1
+        - 5.1.0
+        - 5.0.0
+        - 4.0.1
+        - 4.0.0
+        - 3.7.2
+        - 3.7.1
         - 3.7.0
         - 3.6.2
         - 3.6.1

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
     url: https://docs.nginx.com/nginx-ingress-controller
     about: Check out our documentation.
   - name: General inquiries
-    url: https://github.com/nginxinc/kubernetes-ingress/discussions
+    url: https://github.com/nginx/kubernetes-ingress/discussions
     about: Please use Discussions for all other questions.

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,7 @@ that issue here in this description (not in the title of the PR).
 
 Before creating a PR, run through this checklist and mark each as complete.
 
-- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md) doc
+- [ ] I have read the [CONTRIBUTING](https://github.com/nginx/kubernetes-ingress/blob/main/CONTRIBUTING.md) doc
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] I have checked that all unit tests pass after adding my changes
 - [ ] I have updated necessary documentation

.github/actionlint.yaml

@@ -2,6 +2,7 @@ self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels:
     - kic-plus
+    - ubuntu-24.04-amd64
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
 # Empty array means no configuration variable is allowed.

.github/actions/certify-openshift-image/action.yml

@@ -18,7 +18,11 @@ inputs:
   platforms:
     description: A comma separated list of architectures in the image manifest to certify
     required: false
-    default: ""
+    default: "amd64,arm64"
+  submit:
+    description: Submit results to Redhat PYXIS
+    required: false
+    default: true
 
 outputs:
   result:
@@ -43,14 +47,14 @@ runs:
           IFS=',' read -ra arch_list <<< "${{ inputs.platforms }}"
           for arch in "${arch_list[@]}"; do
               architecture=("${arch#*/}")
-              ./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} --platform $architecture --submit
+              ./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} --platform $architecture ${{ inputs.submit && '--submit' || '' }}
               if [ $? -ne 0 ]; then
                 result=1
               fi
           done
         else
           # no platforms passed, this is either a manifest or a single platform image
-          ./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} --submit
+          ./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} ${{ inputs.submit && '--submit' || '' }}
           result=$?
         fi
         echo "result=$result" >> $GITHUB_OUTPUT

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

@@ -28,12 +28,12 @@ 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
+  plus-jwt:
+    description: JWT for NGINX Plus
+    required: false
 
 outputs:
   test-results-name:
@@ -49,7 +49,7 @@ runs:
     - name: Deploy Kubernetes
       id: k8s
       run: |
-        make -f tests/Makefile create-kind-cluster K8S_CLUSTER_NAME=${{ github.run_id }} K8S_CLUSTER_VERSION=${{ inputs.k8s-version }} K8S_TIMEOUT=${{ inputs.k8s-timeout }}
+        make -f tests/Makefile create-kind-cluster K8S_CLUSTER_NAME=${{ github.run_id }} K8S_CLUSTER_VERSION=v${{ inputs.k8s-version }} K8S_TIMEOUT=${{ inputs.k8s-timeout }}
         make -f tests/Makefile image-load REGISTRY="" PREFIX=${{ inputs.image-name }} TAG=${{ inputs.tag }} K8S_CLUSTER_NAME=${{ github.run_id }}
         label="${{ inputs.label }}"
         nospaces="${label// /_}"
@@ -100,7 +100,7 @@ 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
       shell: bash

.github/config/config-gcr-retag

@@ -1,7 +1,12 @@
 export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev
-declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
-declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips")
+## Disable AWS Marketplace tags
+# declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
+# declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips")
+# declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
+# declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
+declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
+declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
 declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
-declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
-declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
+declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
+declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
 declare -a ADDITIONAL_TAGS=()

.github/config/config-oss-github

@@ -1,5 +1,5 @@
 export TARGET_REGISTRY=ghcr.io
-export TARGET_OSS_IMAGE_PREFIX="nginxinc/kubernetes-ingress"
+export TARGET_OSS_IMAGE_PREFIX="nginx/kubernetes-ingress"
 export PUBLISH_PLUS=false
 export PUBLISH_WAF=false
 export PUBLISH_DOS=false