Merge refs/heads/main into npolshak/add-backport-workflow

kgateway-dev · Jun 20, 2024 · 93cfee9 · 93cfee9
2 parents 0156f8c + 8dcbecd
commit 93cfee9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/nightly-tests.yaml b/.github/workflows/nightly-tests.yaml
@@ -286,7 +286,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kube-e2e-test-type: [ 'gateway', 'gloo', 'ingress', 'helm', 'gloomtls', 'glooctl', 'upgrade' ]
+        # ingress are deprecated from 1.17. Ref: https://solo-io-corp.slack.com/archives/G01EERAK3KJ/p1716389614777799
+        kube-e2e-test-type: [ 'gateway', 'gloo', 'helm', 'gloomtls', 'glooctl', 'upgrade' ]
         kube-version: [ { node: 'v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b', kubectl: 'v1.25.16', kind: 'v0.20.0', helm: 'v3.13.2' },
                         { node: 'v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245', kubectl: 'v1.29.2', kind: 'v0.20.0', helm: 'v3.14.4' } ]
     steps:

diff --git a/.github/workflows/regression-tests.yaml b/.github/workflows/regression-tests.yaml
@@ -49,7 +49,7 @@ jobs:
         # upgrade tests are run on LTS but not on main branch, for main they are run nightly
         # ingress will be deprecated from 1.17. Ref: https://solo-io-corp.slack.com/archives/G01EERAK3KJ/p1716389614777799
         # this is the github action version of ternary op
-        kube-e2e-test-type: [ 'gateway', 'gloo', 'ingress', 'helm', 'gloomtls', 'glooctl', 'upgrade' ]
+        kube-e2e-test-type: [ 'gateway', 'gloo', 'helm', 'gloomtls', 'glooctl', 'upgrade' ]
         kube-version: [ { node: 'v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245', kubectl: 'v1.29.2', kind: 'v0.20.0', helm: 'v3.14.4' } ]
         image-variant:
           - distroless
@@ -58,8 +58,6 @@ jobs:
         exclude:
           - merge-to-main: true
             kube-e2e-test-type: upgrade
-          - merge-to-main: true
-            kube-e2e-test-type: ingress
     steps:
     - uses: actions/checkout@v4
     - id: run-tests

diff --git a/changelog/v1.18.0-beta1/disable-ingress-nightlies.yaml b/changelog/v1.18.0-beta1/disable-ingress-nightlies.yaml
@@ -0,0 +1,7 @@
+changelog:
+- type: NON_USER_FACING
+  description: >-
+    Disable ingress tests on v1.17 nightly runs
+
+    skipCI-kube-tests:true
+    skipCI-docs-build:true