Merge branch 'main' into chore/add-report-marker

Author: Jim Ryan

.codecov.yml

@@ -11,3 +11,6 @@ coverage:
         target: auto
         threshold: 0%
     changes: false
+ignore:
+  - "pkg/client"
+  - "**/*generated*.go"

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -0,0 +1,121 @@
+name: Bug Report
+description: File a bug report.
+title: "[Bug]: "
+labels: ["bug", "ready for refinement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of our F5 NGINX Ingress Controller are you running?
+      options:
+        - edge
+        - 3.6.2
+        - 3.6.1
+        - 3.6.0
+        - 3.5.2
+        - 3.5.1
+        - 3.5.0
+        - 3.4.3
+        - 3.4.2
+        - 3.4.1
+        - 3.4.0
+        - 3.3.2
+        - 3.3.1
+        - 3.3.0
+        - 3.2.1
+        - 3.2.0
+        - 3.1.1
+        - 3.1.0
+        - 3.0.2
+        - 3.0.1
+        - 3.0.0
+        - 2.4.2
+        - 2.4.1
+        - 2.4.0
+        - 2.3.1
+        - 2.3.0
+        - 2.2.2
+        - 2.2.1
+        - 2.2.0
+        - 2.1.2
+        - 2.1.1
+        - 2.1.0
+        - 2.0.3
+        - 2.0.2
+        - 2.0.1
+        - 2.0.0
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What Kubernetes platforms are you running on?
+      options:
+        - Kind
+        - Minikube
+        - Rancher
+        - EKS Amazon
+        - AKS Azure
+        - GKE Google Cloud
+        - Openshift
+        - Other
+      default: 0
+    validations:
+      required: true
+  - type: textarea
+    id: describe-bug
+    attributes:
+      label: What happened?
+      description: Add as much details about the bug as you can.
+      placeholder: Tell is what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: These steps will help us best reproduce the issue and come to a resolution.
+      placeholder: |
+        1. Deploy x to '...' using some.yaml
+        2. View logs on '....'
+        3. See error
+    validations:
+      required: false
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+      description: How did you expect the product/feature to behave?
+      placeholder: What way did you expect this to behave?
+    validations:
+      required: false
+  - type: textarea
+    id: kubernetes-describe-output
+    attributes:
+      label: Kubectl Describe output
+      description: Please run `kubectl describe` on any relevant Kubernetes resources. e.g. `kubectl describe deployment my-nginx-ingress-controller-deployment`. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: false
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Contributing Guidelines
+      description: By submitting this issue, you agree that you have read the [Report a Bug](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md#report-a-bug) section of our [Contributing Guidelines](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md)
+      options:
+        - label: I confirm that I have read the Report a Bug section of the Contributing Guidelines
+          required: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -78,6 +78,7 @@ runs:
         --network=kind \
         -v ${{ github.workspace }}/tests:/workspace/tests \
         -v ${{ github.workspace }}/deployments:/workspace/deployments \
+        -v ${{ github.workspace }}/charts:/workspace/charts \
         -v ${{ github.workspace }}/config:/workspace/config \
         -v ${{ github.workspace }}/pyproject.toml:/workspace/pyproject.toml \
         -v ${{ steps.k8s.outputs.test_output_path }}:${{ steps.k8s.outputs.test_output_path }} \

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

@@ -1,6 +1,7 @@
 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" "-mktpl" "-alpine-fips")
+declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-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 ADDITIONAL_TAGS=()

.github/config/config-gcr-retag

@@ -1,7 +1,7 @@
 export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release
 declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-mktpl")
-declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
-declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi")
+declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl")
+declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
 declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
 declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
 declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")

.github/config/config-plus-gcr-release

@@ -1,8 +1,8 @@
 export TARGET_REGISTRY=docker-mgmt.nginx.com
 export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="nginx-ic-nap-dos/nginx-plus-ingress"
 declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine")
-declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi")
-declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi")
+declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
+declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
 declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
 declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
 export PUBLISH_OSS=false

.github/config/config-plus-nginx

@@ -2,7 +2,7 @@
   "images": [
     {
       "label": "AP_WAF 1/4",
-      "image": "ubi-9-plus-nap",
+      "image": "ubi-8-plus-nap",
       "type": "plus",
       "nap_modules": "waf",
       "marker": "appprotect_waf_policies_allow",

.github/data/matrix-smoke-nap.json

@@ -11,6 +11,7 @@ DEBUG=${DEBUG:-"false"}
 
 DOCS_TO_UPDATE_FOLDER=${ROOTDIR}/docs/content
 FILES_TO_UPDATE_IC_VERSION=(
+    "${ROOTDIR}/.github/data/version.txt"
     "${ROOTDIR}/README.md"
     "${DEPLOYMENT_PATH}/daemon-set/nginx-ingress.yaml"
     "${DEPLOYMENT_PATH}/daemon-set/nginx-plus-ingress.yaml"
@@ -23,6 +24,7 @@ FILES_TO_UPDATE_IC_VERSION=(
     "${HELM_CHART_PATH}/values.yaml"
 )
 FILE_TO_UPDATE_HELM_CHART_VERSION=(
+    "${ROOTDIR}/.github/data/version.txt"
     "${HELM_CHART_PATH}/Chart.yaml"
 )
 

.github/scripts/release-version-update.sh

@@ -20,7 +20,7 @@ permissions:
 jobs:
   checks:
     name: Checks and variables
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       docker_md5: ${{ steps.vars.outputs.docker_md5 }}
       ic_version: ${{ steps.vars.outputs.ic_version }}
@@ -44,7 +44,7 @@ jobs:
 
   build-oss:
     name: Build OSS base images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: checks
     permissions:
       contents: read
@@ -109,7 +109,7 @@ jobs:
 
   build-plus:
     name: Build Plus base images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: checks
     permissions:
       contents: read
@@ -177,7 +177,7 @@ jobs:
 
   build-plus-nap:
     name: Build Plus NAP base images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: checks
     permissions:
       contents: read