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

Signed-off-by: AlexFenlon <[email protected]>

Author: AlexFenlon

.fossa.yml

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

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report.
 title: "[Bug]: "
-labels: ["bug", "ready for refinement"]
+labels: ["bug", "needs triage"]
 body:
   - type: markdown
     attributes:
@@ -14,6 +14,7 @@ body:
       description: What version of our F5 NGINX Ingress Controller are you running?
       options:
         - edge
+        - 3.7.0
         - 3.6.2
         - 3.6.1
         - 3.6.0
@@ -68,14 +69,6 @@ body:
       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:
@@ -86,36 +79,4 @@ body:
         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
+      required: true

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

@@ -31,6 +31,9 @@ inputs:
   azure-ad-secret:
     description: Azure Active Directory secret for JWKs
     required: false
+  registry-token:
+    description: JWT token for accessing container registry
+    required: false
 
 outputs:
   test-results-name:
@@ -76,13 +79,18 @@ runs:
         docker run --rm \
         --name test-runner-${{ github.run_id }} \
         --network=kind \
+        -v "/var/run/docker.sock:/var/run/docker.sock" \
+        -v ~/.docker:/root/.docker \
         -v ${{ github.workspace }}/tests:/workspace/tests \
+        -v ${{ github.workspace }}/examples/common-secrets:/workspace/examples/common-secrets \
         -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 }} \
         -v ~/.kube/kind/config:/root/.kube/config ${{ inputs.test-image }} \
+        --docker-registry-user=oauth2accesstoken \
+        --docker-registry-token=${{ inputs.registry-token }} \
         --context=kind-${{ github.run_id }} \
         --image=${{ inputs.image-name }}:${{ inputs.tag }} \
         --image-pull-policy=Never \

.github/data/matrix-regression.json

@@ -22,6 +22,14 @@
       "nap_modules": "waf",
       "marker": "'appprotect or agent'",
       "platforms": "linux/arm64, linux/amd64"
+    },
+    {
+      "label": "regression",
+      "image": "debian-plus-nap-v5",
+      "type": "plus",
+      "nap_modules": "waf",
+      "marker": "appprotect_waf_v5",
+      "platforms": "linux/arm64, linux/amd64"
     }
   ]
 }

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

@@ -32,6 +32,14 @@
       "marker": "'appprotect_watch or appprotect_batch or appprotect_integration or appprotect_waf_policies_vsr'",
       "platforms": "linux/amd64"
     },
+    {
+      "label": "AP_WAF_V5 1/1",
+      "image": "debian-plus-nap-v5",
+      "type": "plus",
+      "nap_modules": "waf",
+      "marker": "appprotect_waf_v5",
+      "platforms": "linux/amd64"
+    },
     {
       "label": "AP_DOS 1/3",
       "image": "debian-plus-nap",

.github/data/patch-images.json

@@ -59,6 +59,12 @@
     "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
     "platforms": "linux/amd64"
   },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
+    "source_os": "ubi8",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
   {
     "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
     "source_os": "debian",
@@ -71,6 +77,12 @@
     "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
     "platforms": "linux/amd64"
   },
+  {
+    "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
+    "source_os": "ubi8",
+    "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
+    "platforms": "linux/amd64"
+  },
   {
     "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
     "source_os": "debian",

.github/data/version.txt

@@ -1,2 +1,2 @@
-IC_VERSION=3.7.0
-HELM_CHART_VERSION=1.4.0
+IC_VERSION=4.0.0
+HELM_CHART_VERSION=2.0.0

.github/dependabot.yml

@@ -56,6 +56,6 @@ updates:
           - "patch"
 
   - package-ecosystem: gomod
-    directory: /docs
+    directory: /site
     schedule:
       interval: weekly

.github/scripts/exclude_ci_files.txt

@@ -26,6 +26,7 @@
 .github/workflows/dependency-review.yml
 .github/workflows/dockerhub-description.yml
 .github/workflows/docs-build-push.yml
+.github/workflows/f5-cla.yml
 .github/workflows/fossa.yml
 .github/workflows/image-promotion.yml
 .github/workflows/issues.yaml

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

@@ -6,7 +6,7 @@ ROOTDIR=$(git rev-parse --show-toplevel || echo ".")
 TMPDIR=/tmp
 DEBUG=${DEBUG:-"false"}
 
-DOCS_TO_UPDATE_FOLDER=${ROOTDIR}/docs/content
+DOCS_TO_UPDATE_FOLDER=${ROOTDIR}/site/content
 
  usage() {
     echo "Usage: $0 <ic_version> <helm_chart_version> <k8s_versions> <release_date>"