Merge branch 'main' into oss-workflow

Author: tomasohaodha

.github/workflows/build-oss.yml

@@ -118,7 +118,7 @@ jobs:
             io.artifacthub.package.keywords=kubernetes,ingress,nginx,controller
 
       - name: Build Docker image
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+        uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 # v3.3.0
         id: build-push
         with:
           file: build/Dockerfile
@@ -147,7 +147,7 @@ jobs:
           ignore-unfixed: 'true'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750 # v2.1.38
+        uses: github/codeql-action/upload-sarif@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39
         continue-on-error: true
         with:
           sarif_file: 'trivy-results-${{ inputs.image }}.sarif'

.github/workflows/build-plus.yml

@@ -100,7 +100,7 @@ jobs:
         if: ${{ inputs.nap_modules != '' }}
 
       - name: Build Plus Docker image
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+        uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 # v3.3.0
         with:
           file: build/Dockerfile
           context: '.'
@@ -125,7 +125,7 @@ jobs:
             ${{ inputs.nap_modules != '' && contains(inputs.image, 'ubi') && format('"rhel_license={0}"', secrets.RHEL_LICENSE) || '' }}
 
       - name: Load image for Trivy
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+        uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 # v3.3.0
         with:
           file: build/Dockerfile
           context: '.'
@@ -153,7 +153,7 @@ jobs:
           ignore-unfixed: 'true'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750 # v2.1.38
+        uses: github/codeql-action/upload-sarif@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39
         continue-on-error: true
         with:
           sarif_file: 'trivy-results-${{ inputs.image }}.sarif'

.github/workflows/ci.yml

@@ -135,7 +135,7 @@ jobs:
       - name: Docker Buildx
         uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
       - name: Build Docker Image ${{ matrix.image }}
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+        uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 # v3.3.0
         with:
           file: build/Dockerfile
           context: '.'

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@515828d97454b8354517688ddc5b48402b723750 # v2.1.38
+      uses: github/codeql-action/init@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@515828d97454b8354517688ddc5b48402b723750 # v2.1.38
+      uses: github/codeql-action/autobuild@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -61,4 +61,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@515828d97454b8354517688ddc5b48402b723750 # v2.1.38
+      uses: github/codeql-action/analyze@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39

.github/workflows/scorecards.yml

@@ -53,6 +53,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750 # v2.1.38
+        uses: github/codeql-action/upload-sarif@a34ca99b4610d924e04c68db79e503e1f79f9f02 # v2.1.39
         with:
           sarif_file: results.sarif

.github/workflows/sync.yml

@@ -13,24 +13,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # This job sync this repo to our internal repo
-  repo-sync:
-    runs-on: ubuntu-22.04
-    if: ${{ github.event.repository.fork == false }}
-    steps:
-      - name: Repo Sync
-        uses: wei/git-sync@55c6b63b4f21607da0e9877ca9b4d11a29fc6d83 # v3.0.0
-        with:
-          source_repo: "nginxinc/kubernetes-ingress"
-          source_branch: "main"
-          destination_repo: ${{ secrets.SYNC_DEST_REPO_URL }}
-          destination_branch: "main"
-          ssh_private_key: ${{ secrets.SYNC_SSH_PRIVATE_KEY }}
-
   # This job sync the labels across the various repos
   labels-sync:
+    runs-on: ubuntu-22.04
+    if: ${{ github.event.repository.fork == false }}
     strategy:
-      # don't break another job if one is failed
       fail-fast: false
       matrix:
         repo:
@@ -39,8 +26,6 @@ jobs:
           - nginxinc/nginx-prometheus-exporter
           - nginxinc/nginx-plus-go-client
           - nginxinc/nginx-asg-sync
-    runs-on: ubuntu-22.04
-    if: ${{ github.event.repository.fork == false }}
     steps:
       - name: Checkout
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

deployments/common/crds/k8s.nginx.org_virtualserverroutes.yaml

@@ -515,6 +515,8 @@ spec:
                             type: string
                           jitter:
                             type: string
+                          keepalive-time:
+                            type: string
                           mandatory:
                             type: boolean
                           passes:

deployments/common/crds/k8s.nginx.org_virtualservers.yaml

@@ -597,6 +597,8 @@ spec:
                             type: string
                           jitter:
                             type: string
+                          keepalive-time:
+                            type: string
                           mandatory:
                             type: boolean
                           passes:

deployments/helm-chart/crds/k8s.nginx.org_virtualserverroutes.yaml

@@ -515,6 +515,8 @@ spec:
                             type: string
                           jitter:
                             type: string
+                          keepalive-time:
+                            type: string
                           mandatory:
                             type: boolean
                           passes:

deployments/helm-chart/crds/k8s.nginx.org_virtualservers.yaml

@@ -597,6 +597,8 @@ spec:
                             type: string
                           jitter:
                             type: string
+                          keepalive-time:
+                            type: string
                           mandatory:
                             type: boolean
                           passes: