Bump consul version to 1.10-rc

hashicorp · Jun 17, 2021 · 98ca3f1 · 98ca3f1
1 parent 81a4c20
commit 98ca3f1
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 239 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,8 +6,8 @@ executors:
       - image: docker.mirror.hashicorp.services/circleci/golang:1.16
     environment:
       TEST_RESULTS: /tmp/test-results # path to where test results are saved
-      CONSUL_VERSION: 1.10.0-beta4 # Consul's OSS version to use in tests
-      CONSUL_ENT_VERSION: 1.10.0+ent-beta4 # Consul's enterprise version to use in tests
+      CONSUL_VERSION: 1.10.0-rc # Consul's OSS version to use in tests
+      CONSUL_ENT_VERSION: 1.10.0+ent-rc # Consul's enterprise version to use in tests
 
 jobs:
   go-fmt-and-vet:

diff --git a/connect-inject/endpoints_controller_ent_test.go b/connect-inject/endpoints_controller_ent_test.go
@@ -151,7 +151,6 @@ func TestReconcileCreateEndpointWithNamespaces(t *testing.T) {
 					ServiceProxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-created",
 						DestinationServiceID:   "pod1-service-created",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod1", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: test.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -165,7 +164,6 @@ func TestReconcileCreateEndpointWithNamespaces(t *testing.T) {
 					ServiceProxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-created",
 						DestinationServiceID:   "pod2-service-created",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod2", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: test.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -437,7 +435,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod1-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Namespace: ts.ExpConsulNS,
 					},
@@ -516,7 +513,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod1-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Namespace: ts.ExpConsulNS,
 					},
@@ -584,7 +580,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "different-consul-svc-name",
 							DestinationServiceID:   "pod1-different-consul-svc-name",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Namespace: ts.ExpConsulNS,
 					},
@@ -661,7 +656,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod1-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Namespace: ts.ExpConsulNS,
 					},
@@ -738,7 +732,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod1-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -760,7 +753,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod2-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -829,7 +821,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "different-consul-svc-name",
 							DestinationServiceID:   "pod1-different-consul-svc-name",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -851,7 +842,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "different-consul-svc-name",
 							DestinationServiceID:   "pod2-different-consul-svc-name",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -905,7 +895,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod1-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -927,7 +916,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-updated",
 							DestinationServiceID:   "pod2-service-updated",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -969,7 +957,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "different-consul-svc-name",
 							DestinationServiceID:   "pod1-different-consul-svc-name",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -991,7 +978,6 @@ func TestReconcileUpdateEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "different-consul-svc-name",
 							DestinationServiceID:   "pod2-different-consul-svc-name",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,
@@ -1205,7 +1191,6 @@ func TestReconcileDeleteEndpointWithNamespaces(t *testing.T) {
 						Proxy: &api.AgentServiceConnectProxyConfig{
 							DestinationServiceName: "service-deleted",
 							DestinationServiceID:   "pod1-service-deleted",
-							TransparentProxy:       &api.TransparentProxyConfig{},
 						},
 						Meta:      map[string]string{"k8s-service-name": "service-deleted", "k8s-namespace": ts.SourceKubeNS, MetaKeyManagedBy: managedByValue},
 						Namespace: ts.ExpConsulNS,

diff --git a/connect-inject/endpoints_controller_test.go b/connect-inject/endpoints_controller_test.go
@@ -561,7 +561,6 @@ func TestReconcileCreateEndpoint(t *testing.T) {
 						DestinationServiceID:   "pod1-service-created",
 						LocalServiceAddress:    "",
 						LocalServicePort:       0,
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod1", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: "default", MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -648,7 +647,6 @@ func TestReconcileCreateEndpoint(t *testing.T) {
 						DestinationServiceID:   "pod1-service-created",
 						LocalServiceAddress:    "",
 						LocalServicePort:       0,
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod1", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: "default", MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -663,7 +661,6 @@ func TestReconcileCreateEndpoint(t *testing.T) {
 						DestinationServiceID:   "pod2-service-created",
 						LocalServiceAddress:    "",
 						LocalServicePort:       0,
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod2", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: "default", MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -773,7 +770,6 @@ func TestReconcileCreateEndpoint(t *testing.T) {
 						DestinationServiceID:   "pod1-service-created",
 						LocalServiceAddress:    "",
 						LocalServicePort:       0,
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod1", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: "default", MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -788,7 +784,6 @@ func TestReconcileCreateEndpoint(t *testing.T) {
 						DestinationServiceID:   "pod2-service-created",
 						LocalServiceAddress:    "",
 						LocalServicePort:       0,
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					ServiceMeta: map[string]string{MetaKeyPodName: "pod2", MetaKeyKubeServiceName: "service-created", MetaKeyKubeNS: "default", MetaKeyManagedBy: managedByValue},
 					ServiceTags: []string{},
@@ -883,7 +878,6 @@ func TestReconcileCreateEndpoint(t *testing.T) {
 						DestinationServiceID:   "pod1-different-consul-svc-name",
 						LocalServiceAddress:    "127.0.0.1",
 						LocalServicePort:       1234,
-						TransparentProxy:       &api.TransparentProxyConfig{},
 						Upstreams: []api.Upstream{
 							{
 								DestinationType: api.UpstreamDestTypeService,
@@ -1108,7 +1102,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1181,7 +1174,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1262,7 +1254,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1343,7 +1334,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1426,7 +1416,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1509,7 +1498,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1584,7 +1572,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1648,7 +1635,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "different-consul-svc-name",
 						DestinationServiceID:   "pod1-different-consul-svc-name",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1721,7 +1707,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 				},
 			},
@@ -1812,7 +1797,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -1832,7 +1816,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod2-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -1897,7 +1880,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "different-consul-svc-name",
 						DestinationServiceID:   "pod1-different-consul-svc-name",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -1917,7 +1899,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "different-consul-svc-name",
 						DestinationServiceID:   "pod2-different-consul-svc-name",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -1967,7 +1948,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod1-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -1987,7 +1967,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-updated",
 						DestinationServiceID:   "pod2-service-updated",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -2027,7 +2006,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "different-consul-svc-name",
 						DestinationServiceID:   "pod1-different-consul-svc-name",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -2047,7 +2025,6 @@ func TestReconcileUpdateEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "different-consul-svc-name",
 						DestinationServiceID:   "pod2-different-consul-svc-name",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-updated", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -2204,7 +2181,6 @@ func TestReconcileDeleteEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-deleted",
 						DestinationServiceID:   "pod1-service-deleted",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-deleted", "k8s-namespace": "default"},
 				},
@@ -2230,7 +2206,6 @@ func TestReconcileDeleteEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "service-deleted",
 						DestinationServiceID:   "pod1-service-deleted",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-deleted", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -2256,7 +2231,6 @@ func TestReconcileDeleteEndpoint(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "different-consul-svc-name",
 						DestinationServiceID:   "pod1-different-consul-svc-name",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": "service-deleted", "k8s-namespace": "default", MetaKeyManagedBy: managedByValue},
 				},
@@ -2982,7 +2956,6 @@ func TestServiceInstancesForK8SServiceNameAndNamespace(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "foo",
 						DestinationServiceID:   "foo1",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": k8sSvc, "k8s-namespace": k8sNS},
 				},
@@ -3007,7 +2980,6 @@ func TestServiceInstancesForK8SServiceNameAndNamespace(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "foo",
 						DestinationServiceID:   "foo1",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": c.k8sServiceNameMeta, "k8s-namespace": c.k8sNamespaceMeta},
 				},
@@ -3025,7 +2997,6 @@ func TestServiceInstancesForK8SServiceNameAndNamespace(t *testing.T) {
 					Proxy: &api.AgentServiceConnectProxyConfig{
 						DestinationServiceName: "k8s-service-different-ns",
 						DestinationServiceID:   "k8s-service-different-ns-id",
-						TransparentProxy:       &api.TransparentProxyConfig{},
 					},
 					Meta: map[string]string{"k8s-service-name": c.k8sServiceNameMeta, "k8s-namespace": "different-ns"},
 				},