backport of commit 485cb4d

hashicorp · Feb 17, 2023 · 78ff7e1 · 78ff7e1
1 parent 01ca6e2
commit 78ff7e1
Show file tree

Hide file tree

Showing 32 changed files with 251 additions and 1,255 deletions.
diff --git a/.changelog/16274.txt b/.changelog/16274.txt
diff --git a/.changelog/16292.txt b/.changelog/16292.txt
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,10 +23,10 @@ references:
     BASH_ENV: .circleci/bash_env.sh
     GO_VERSION: 1.19.4
   envoy-versions: &supported_envoy_versions
-    - &default_envoy_version "1.22.7"
-    - "1.23.4"
-    - "1.24.2"
-    - "1.25.1"
+    - &default_envoy_version "1.21.5"
+    - "1.22.5"
+    - "1.23.2"
+    - "1.24.0"
   nomad-versions: &supported_nomad_versions
     - &default_nomad_version "1.3.3"
     - "1.2.10"

diff --git a/.github/workflows/nightly-test-1.15.x.yaml → .github/workflows/nightly-test-1.11.x.yaml b/.github/workflows/nightly-test-1.15.x.yaml → .github/workflows/nightly-test-1.11.x.yaml
@@ -1,13 +1,13 @@
-name: Nightly Test 1.15.x
+name: Nightly Test 1.11.x
 on:
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch: {}
 
 env:
   EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
-  BRANCH: "release/1.15.x"
-  BRANCH_NAME: "release/1.15.x" # Used for naming artifacts
+  BRANCH: "release/1.11.x"
+  BRANCH_NAME: "release-1.11.x" # Used for naming artifacts
 
 jobs:
   frontend-test-workspace-node:

diff --git a/agent/proxycfg/testing_api_gateway.go b/agent/proxycfg/testing_api_gateway.go
diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go
@@ -527,211 +527,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 				}, nil)
 			},
 		},
-		{
-			name: "api-gateway",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, nil, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-nil-config-entry",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway_NilConfigEntry(t)
-			},
-		},
-		{
-			name: "api-gateway-tcp-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener",
-							Protocol: structs.ListenerProtocolTCP,
-							Port:     8080,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-						},
-					}
-				}, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-tcp-listener-with-tcp-route",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener",
-							Protocol: structs.ListenerProtocolTCP,
-							Port:     8080,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "tcp-route",
-									Kind: structs.TCPRoute,
-								},
-							},
-						},
-					}
-
-				}, []structs.BoundRoute{
-					&structs.TCPRouteConfigEntry{
-						Name: "tcp-route",
-						Kind: structs.TCPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Services: []structs.TCPService{
-							{Name: "tcp-service"},
-						},
-					},
-				}, nil)
-			},
-		},
-		{
-			name: "api-gateway-http-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener",
-							Protocol: structs.ListenerProtocolHTTP,
-							Port:     8080,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name:   "listener",
-							Routes: []structs.ResourceReference{},
-						},
-					}
-				}, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-http-listener-with-http-route",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener",
-							Protocol: structs.ListenerProtocolHTTP,
-							Port:     8080,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "http-route",
-									Kind: structs.HTTPRoute,
-								},
-							},
-						},
-					}
-				}, []structs.BoundRoute{
-					&structs.HTTPRouteConfigEntry{
-						Name: "http-route",
-						Kind: structs.HTTPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Rules: []structs.HTTPRouteRule{
-							{
-								Services: []structs.HTTPService{
-									{Name: "http-service"},
-								},
-							},
-						},
-					},
-				}, nil)
-			},
-		},
-		{
-			name: "api-gateway-tcp-listener-with-tcp-and-http-route",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener-tcp",
-							Protocol: structs.ListenerProtocolTCP,
-							Port:     8080,
-						},
-						{
-							Name:     "listener-http",
-							Protocol: structs.ListenerProtocolHTTP,
-							Port:     8081,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener-tcp",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "tcp-route",
-									Kind: structs.TCPRoute,
-								},
-							},
-						},
-						{
-							Name: "listener-http",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "http-route",
-									Kind: structs.HTTPRoute,
-								},
-							},
-						},
-					}
-
-				}, []structs.BoundRoute{
-					&structs.TCPRouteConfigEntry{
-						Name: "tcp-route",
-						Kind: structs.TCPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Services: []structs.TCPService{
-							{Name: "tcp-service"},
-						},
-					},
-					&structs.HTTPRouteConfigEntry{
-						Name: "http-route",
-						Kind: structs.HTTPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Rules: []structs.HTTPRouteRule{
-							{
-								Services: []structs.HTTPService{
-									{Name: "http-service"},
-								},
-							},
-						},
-					},
-				}, nil)
-			},
-		},
 		{
 			name: "ingress-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {