Add Consul 1.16 to test matrices

.github/workflows/ci.yml

@@ -38,10 +38,12 @@ jobs:
         consul-version:
         - 1.13.7
         - 1.13.7+ent
-        - 1.14.5
-        - 1.14.5+ent
-        - 1.15.1
-        - 1.15.1+ent
+        - 1.14.7
+        - 1.14.7+ent
+        - 1.15.3
+        - 1.15.3+ent
+        - 1.16.0-rc1
+        - 1.16.0-rc1+ent
     runs-on: ubuntu-latest
     env:
       TEST_RESULTS_DIR: /tmp/test-results/consul@${{ matrix.consul-version }}
@@ -93,10 +95,10 @@ jobs:
         consul-image:
         - 'hashicorp/consul:1.13.7'
         - 'hashicorp/consul-enterprise:1.13.7-ent'
-        - 'hashicorp/consul:1.14.5'
-        - 'hashicorp/consul-enterprise:1.14.5-ent'
-        - 'hashicorp/consul:1.15.1'
-        - 'hashicorp/consul-enterprise:1.15.1-ent'
+        - 'hashicorp/consul:1.14.7'
+        - 'hashicorp/consul-enterprise:1.14.7-ent'
+        - 'hashicorp/consul:1.15.3'
+        - 'hashicorp/consul-enterprise:1.15.3-ent'
         - 'hashicorppreview/consul:1.16-dev'
         - 'hashicorppreview/consul-enterprise:1.16-dev'
     runs-on: ubuntu-latest

.github/workflows/conformance.yml

@@ -47,11 +47,17 @@ jobs:
             envoy-image: "envoyproxy/envoy:v1.24-latest"
             consul-k8s-version: "v1.0.1"
             envoy-field: "apiGateway.imageEnvoy"
-          - name: "consul@v1.15-dev + consul-k8s@v1.0.1"
+          - name: "consul@v1.15 + consul-k8s@v1.1.2"
             api-gateway-image: "hashicorppreview/consul-api-gateway:0.5-dev"
-            consul-image: "hashicorppreview/consul:1.15-dev"
-            envoy-image: "envoyproxy/envoy:v1.24-latest"
-            consul-k8s-version: "v1.0.1"
+            consul-image: "hashicorp/consul:1.15"
+            envoy-image: "envoyproxy/envoy:v1.25-latest"
+            consul-k8s-version: "v1.1.2"
+            envoy-field: "apiGateway.imageEnvoy"
+          - name: "consul@v1.16-dev + consul-k8s@v1.2.0-rc1"
+            api-gateway-image: "hashicorppreview/consul-api-gateway:0.5-dev"
+            consul-image: "hashicorppreview/consul:1.16-dev"
+            envoy-image: "envoyproxy/envoy:v1.26-latest"
+            consul-k8s-version: "v1.2.0-rc1"
             envoy-field: "apiGateway.imageEnvoy"
       fail-fast: false
     name: "${{ matrix.cluster-type }} - ${{ matrix.config.name }}"

.github/workflows/conformance_with_build.yml

@@ -49,11 +49,17 @@ jobs:
             envoy-image: "envoyproxy/envoy:v1.24-latest"
             consul-k8s-version: "v1.0.1"
             envoy-field: "apiGateway.imageEnvoy"
-          - name: "consul@v1.15-dev + consul-k8s@v1.0.1"
+          - name: "consul@v1.15 + consul-k8s@v1.1.2"
             api-gateway-image: "consul-api-gateway:local-build"
-            consul-image: "hashicorppreview/consul:1.15-dev"
-            envoy-image: "envoyproxy/envoy:v1.24-latest"
-            consul-k8s-version: "v1.0.1"
+            consul-image: "hashicorp/consul:1.15"
+            envoy-image: "envoyproxy/envoy:v1.25-latest"
+            consul-k8s-version: "v1.1.2"
+            envoy-field: "apiGateway.imageEnvoy"
+          - name: "consul@v1.16-dev + consul-k8s@v1.2.0-rc1"
+            api-gateway-image: "consul-api-gateway:local-build"
+            consul-image: "hashicorppreview/consul:1.16-dev"
+            envoy-image: "envoyproxy/envoy:v1.26-latest"
+            consul-k8s-version: "v1.2.0-rc1"
             envoy-field: "apiGateway.imageEnvoy"
       fail-fast: false
     name: "${{ matrix.config.name }}"

internal/testing/conformance/consul-config.yaml

@@ -9,6 +9,10 @@ server:
 connectInject:
   enabled: true
   default: true
+  # For consul-k8s >= 1.2.0, allow consul-api-gateway tests to install their own
+  # CRDs just like they did before api-gateway was integrated into consul-k8s
+  apiGateway:
+    manageExternalCRDs: false
 controller:
   enabled: true
 apiGateway: