wip

hashicorp · Jul 22, 2022 · 300f87b · 300f87b
1 parent e09eae8
commit 300f87b
Show file tree

Hide file tree

Showing 8 changed files with 256 additions and 89 deletions.
diff --git a/acceptance/tests/peering/peering_connect_namespaces_test.go b/acceptance/tests/peering/peering_connect_namespaces_test.go
@@ -66,6 +66,24 @@ func TestPeering_ConnectNamespaces(t *testing.T) {
 			true,
 			false,
 		},
+		{
+			"default destination namespace",
+			defaultNamespace,
+			false,
+			true,
+		},
+		{
+			"single destination namespace",
+			staticServerNamespace,
+			false,
+			true,
+		},
+		{
+			"mirror k8s namespaces",
+			staticServerNamespace,
+			true,
+			true,
+		},
 	}
 
 	for _, c := range cases {
@@ -77,8 +95,8 @@ func TestPeering_ConnectNamespaces(t *testing.T) {
 				"global.peering.enabled":        "true",
 				"global.enableConsulNamespaces": "true",
 
-				"global.image":    "thisisnotashwin/consul@sha256:0733380a1a177d269c53fff62464e3a4840ea0c3ca24c6164282f8a822ec8825",
-				"global.imageK8S": "thisisnotashwin/consul-k8s@sha256:6fe1ec532876073813c824f27b2c972c03a41376e0729a502f6f3302dc352379",
+				"global.image":    "thisisnotashwin/consul@sha256:1cb055ffd00ef1652dd425d14cf50ef2b6ac3f455efcf338f032d53812ae1c6d",
+				"global.imageK8S": "thisisnotashwin/consul-k8s@sha256:78e58cc3dc750af60c59a7d9ea6399a2632a8626adf26e02b915513c3424b7a1",
 
 				"global.tls.enabled":           "true",
 				"global.tls.httpsOnly":         strconv.FormatBool(c.ACLsAndAutoEncryptEnabled),
@@ -267,60 +285,94 @@ func TestPeering_ConnectNamespaces(t *testing.T) {
 				})
 			}
 
-			logger.Log(t, "checking that connection is successful")
-			if cfg.EnableTransparentProxy {
-				k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, fmt.Sprintf("http://static-server.virtual.%s.%s.consul", c.destinationNamespace, staticServerPeer))
-			} else {
-				k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, "http://localhost:1234")
-			}
+			if c.ACLsAndAutoEncryptEnabled {
+				logger.Log(t, "checking that the connection is not successful because there's no allow intention")
+				if cfg.EnableTransparentProxy {
+					k8s.CheckStaticServerConnectionMultipleFailureMessages(t, staticClientOpts, staticClientName, false, []string{"curl: (56) Recv failure: Connection reset by peer", "curl: (52) Empty reply from server", "curl: (7) Failed to connect to static-server.ns1 port 80: Connection refused"}, "", fmt.Sprintf("http://static-server.virtual.%s.%s.consul", c.destinationNamespace, staticServerPeer))
+				} else {
+					k8s.CheckStaticServerConnectionFailing(t, staticClientOpts, staticClientName, "http://localhost:1234")
+				}
 
-			denyAllIntention := &api.ServiceIntentionsConfigEntry{
-				Name:      "*",
-				Kind:      api.ServiceIntentions,
-				Namespace: "*",
-				Sources: []*api.SourceIntention{
-					{
-						Name:      "*",
-						Namespace: "*",
-						Action:    api.IntentionActionDeny,
-						Peer:      staticClientPeer,
+				intention := &api.ServiceIntentionsConfigEntry{
+					Name:      staticServerName,
+					Kind:      api.ServiceIntentions,
+					Namespace: staticServerNamespace,
+					Sources: []*api.SourceIntention{
+						{
+							Name:      staticClientName,
+							Namespace: staticClientNamespace,
+							Action:    api.IntentionActionAllow,
+							Peer:      staticClientPeer,
+						},
 					},
-				},
-			}
-			_, _, err = staticServerPeerClient.ConfigEntries().Set(denyAllIntention, &api.WriteOptions{})
-			require.NoError(t, err)
+				}
 
-			logger.Log(t, "checking that the connection is not successful because there's no allow intention")
-			if cfg.EnableTransparentProxy {
-				k8s.CheckStaticServerConnectionMultipleFailureMessages(t, staticClientOpts, staticClientName, false, []string{"curl: (56) Recv failure: Connection reset by peer", "curl: (52) Empty reply from server", "curl: (7) Failed to connect to static-server.ns1 port 80: Connection refused"}, "", fmt.Sprintf("http://static-server.virtual.%s.%s.consul", c.destinationNamespace, staticServerPeer))
+				// Set the destination namespace to be the same
+				// unless mirrorK8S is true.
+				if !c.mirrorK8S {
+					intention.Namespace = c.destinationNamespace
+					intention.Sources[0].Namespace = c.destinationNamespace
+				}
+
+				logger.Log(t, "creating intentions in server peer")
+				_, _, err = staticServerPeerClient.ConfigEntries().Set(intention, &api.WriteOptions{})
+				require.NoError(t, err)
 			} else {
-				k8s.CheckStaticServerConnectionFailing(t, staticClientOpts, staticClientName, "http://localhost:1234")
-			}
+				logger.Log(t, "checking that connection is successful")
+				if cfg.EnableTransparentProxy {
+					k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, fmt.Sprintf("http://static-server.virtual.%s.%s.consul", c.destinationNamespace, staticServerPeer))
+				} else {
+					k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, "http://localhost:1234")
+				}
 
-			intention := &api.ServiceIntentionsConfigEntry{
-				Name:      staticServerName,
-				Kind:      api.ServiceIntentions,
-				Namespace: staticServerNamespace,
-				Sources: []*api.SourceIntention{
-					{
-						Name:      staticClientName,
-						Namespace: staticClientNamespace,
-						Action:    api.IntentionActionAllow,
-						Peer:      staticClientPeer,
+				denyAllIntention := &api.ServiceIntentionsConfigEntry{
+					Name:      "*",
+					Kind:      api.ServiceIntentions,
+					Namespace: "*",
+					Sources: []*api.SourceIntention{
+						{
+							Name:      "*",
+							Namespace: "*",
+							Action:    api.IntentionActionDeny,
+							Peer:      staticClientPeer,
+						},
 					},
-				},
-			}
+				}
+				_, _, err = staticServerPeerClient.ConfigEntries().Set(denyAllIntention, &api.WriteOptions{})
+				require.NoError(t, err)
 
-			// Set the destination namespace to be the same
-			// unless mirrorK8S is true.
-			if !c.mirrorK8S {
-				intention.Namespace = c.destinationNamespace
-				intention.Sources[0].Namespace = c.destinationNamespace
-			}
+				logger.Log(t, "checking that the connection is not successful because there's no allow intention")
+				if cfg.EnableTransparentProxy {
+					k8s.CheckStaticServerConnectionMultipleFailureMessages(t, staticClientOpts, staticClientName, false, []string{"curl: (56) Recv failure: Connection reset by peer", "curl: (52) Empty reply from server", "curl: (7) Failed to connect to static-server.ns1 port 80: Connection refused"}, "", fmt.Sprintf("http://static-server.virtual.%s.%s.consul", c.destinationNamespace, staticServerPeer))
+				} else {
+					k8s.CheckStaticServerConnectionFailing(t, staticClientOpts, staticClientName, "http://localhost:1234")
+				}
 
-			logger.Log(t, "creating intentions in server peer")
-			_, _, err = staticServerPeerClient.ConfigEntries().Set(intention, &api.WriteOptions{})
-			require.NoError(t, err)
+				intention := &api.ServiceIntentionsConfigEntry{
+					Name:      staticServerName,
+					Kind:      api.ServiceIntentions,
+					Namespace: staticServerNamespace,
+					Sources: []*api.SourceIntention{
+						{
+							Name:      staticClientName,
+							Namespace: staticClientNamespace,
+							Action:    api.IntentionActionAllow,
+							Peer:      staticClientPeer,
+						},
+					},
+				}
+
+				// Set the destination namespace to be the same
+				// unless mirrorK8S is true.
+				if !c.mirrorK8S {
+					intention.Namespace = c.destinationNamespace
+					intention.Sources[0].Namespace = c.destinationNamespace
+				}
+
+				logger.Log(t, "creating intentions in server peer")
+				_, _, err = staticServerPeerClient.ConfigEntries().Set(intention, &api.WriteOptions{})
+				require.NoError(t, err)
+			}
 
 			logger.Log(t, "checking that connection is successful")
 			if cfg.EnableTransparentProxy {

diff --git a/acceptance/tests/peering/peering_connect_test.go b/acceptance/tests/peering/peering_connect_test.go
@@ -40,6 +40,10 @@ func TestPeering_Connect(t *testing.T) {
 			"default installation",
 			false,
 		},
+		{
+			"default installation",
+			true,
+		},
 	}
 
 	for _, c := range cases {
@@ -50,8 +54,8 @@ func TestPeering_Connect(t *testing.T) {
 			commonHelmValues := map[string]string{
 				"global.peering.enabled": "true",
 
-				"global.image":    "thisisnotashwin/consul@sha256:0733380a1a177d269c53fff62464e3a4840ea0c3ca24c6164282f8a822ec8825",
-				"global.imageK8S": "thisisnotashwin/consul-k8s@sha256:6fe1ec532876073813c824f27b2c972c03a41376e0729a502f6f3302dc352379",
+				"global.image":    "thisisnotashwin/consul@sha256:1cb055ffd00ef1652dd425d14cf50ef2b6ac3f455efcf338f032d53812ae1c6d",
+				"global.imageK8S": "thisisnotashwin/consul-k8s@sha256:78e58cc3dc750af60c59a7d9ea6399a2632a8626adf26e02b915513c3424b7a1",
 
 				"global.tls.enabled":           "true",
 				"global.tls.httpsOnly":         strconv.FormatBool(c.ACLsAndAutoEncryptEnabled),
@@ -211,49 +215,75 @@ func TestPeering_Connect(t *testing.T) {
 			helpers.Cleanup(t, cfg.NoCleanupOnFailure, func() {
 				k8s.KubectlDeleteK(t, staticServerPeerClusterContext.KubectlOptions(t), "../fixtures/cases/crd-peers/default")
 			})
-			logger.Log(t, "checking that connection is successful")
-			if cfg.EnableTransparentProxy {
-				k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, fmt.Sprintf("http://static-server.virtual.%s.consul", staticServerPeer))
-			} else {
-				k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, "http://localhost:1234")
-			}
 
-			denyAllIntention := &api.ServiceIntentionsConfigEntry{
-				Name: "*",
-				Kind: api.ServiceIntentions,
-				Sources: []*api.SourceIntention{
-					{
-						Name:   "*",
-						Action: api.IntentionActionDeny,
-						Peer:   staticClientPeer,
+			if c.ACLsAndAutoEncryptEnabled {
+				logger.Log(t, "checking that the connection is not successful because there's no allow intention")
+				if cfg.EnableTransparentProxy {
+					k8s.CheckStaticServerConnectionMultipleFailureMessages(t, staticClientOpts, staticClientName, false, []string{"curl: (56) Recv failure: Connection reset by peer", "curl: (52) Empty reply from server", "curl: (7) Failed to connect to static-server.ns1 port 80: Connection refused"}, "", fmt.Sprintf("http://static-server.virtual.%s.consul", staticServerPeer))
+				} else {
+					k8s.CheckStaticServerConnectionFailing(t, staticClientOpts, staticClientName, "http://localhost:1234")
+				}
+
+				intention := &api.ServiceIntentionsConfigEntry{
+					Name: staticServerName,
+					Kind: api.ServiceIntentions,
+					Sources: []*api.SourceIntention{
+						{
+							Name:   staticClientName,
+							Action: api.IntentionActionAllow,
+							Peer:   staticClientPeer,
+						},
 					},
-				},
-			}
-			_, _, err = staticServerPeerClient.ConfigEntries().Set(denyAllIntention, &api.WriteOptions{})
-			require.NoError(t, err)
+				}
 
-			logger.Log(t, "checking that the connection is not successful because there's no allow intention")
-			if cfg.EnableTransparentProxy {
-				k8s.CheckStaticServerConnectionMultipleFailureMessages(t, staticClientOpts, staticClientName, false, []string{"curl: (56) Recv failure: Connection reset by peer", "curl: (52) Empty reply from server", "curl: (7) Failed to connect to static-server.ns1 port 80: Connection refused"}, "", fmt.Sprintf("http://static-server.virtual.%s.consul", staticServerPeer))
+				logger.Log(t, "creating intentions in server peer")
+				_, _, err = staticServerPeerClient.ConfigEntries().Set(intention, &api.WriteOptions{})
+				require.NoError(t, err)
 			} else {
-				k8s.CheckStaticServerConnectionFailing(t, staticClientOpts, staticClientName, "http://localhost:1234")
-			}
-
-			intention := &api.ServiceIntentionsConfigEntry{
-				Name: staticServerName,
-				Kind: api.ServiceIntentions,
-				Sources: []*api.SourceIntention{
-					{
-						Name:   staticClientName,
-						Action: api.IntentionActionAllow,
-						Peer:   staticClientPeer,
+				logger.Log(t, "checking that connection is successful")
+				if cfg.EnableTransparentProxy {
+					k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, fmt.Sprintf("http://static-server.virtual.%s.consul", staticServerPeer))
+				} else {
+					k8s.CheckStaticServerConnectionSuccessful(t, staticClientOpts, staticClientName, "http://localhost:1234")
+				}
+
+				denyAllIntention := &api.ServiceIntentionsConfigEntry{
+					Name: "*",
+					Kind: api.ServiceIntentions,
+					Sources: []*api.SourceIntention{
+						{
+							Name:   "*",
+							Action: api.IntentionActionDeny,
+							Peer:   staticClientPeer,
+						},
 					},
-				},
-			}
+				}
+				_, _, err = staticServerPeerClient.ConfigEntries().Set(denyAllIntention, &api.WriteOptions{})
+				require.NoError(t, err)
+
+				logger.Log(t, "checking that the connection is not successful because there's no allow intention")
+				if cfg.EnableTransparentProxy {
+					k8s.CheckStaticServerConnectionMultipleFailureMessages(t, staticClientOpts, staticClientName, false, []string{"curl: (56) Recv failure: Connection reset by peer", "curl: (52) Empty reply from server", "curl: (7) Failed to connect to static-server.ns1 port 80: Connection refused"}, "", fmt.Sprintf("http://static-server.virtual.%s.consul", staticServerPeer))
+				} else {
+					k8s.CheckStaticServerConnectionFailing(t, staticClientOpts, staticClientName, "http://localhost:1234")
+				}
+
+				intention := &api.ServiceIntentionsConfigEntry{
+					Name: staticServerName,
+					Kind: api.ServiceIntentions,
+					Sources: []*api.SourceIntention{
+						{
+							Name:   staticClientName,
+							Action: api.IntentionActionAllow,
+							Peer:   staticClientPeer,
+						},
+					},
+				}
 
-			logger.Log(t, "creating intentions in server peer")
-			_, _, err = staticServerPeerClient.ConfigEntries().Set(intention, &api.WriteOptions{})
-			require.NoError(t, err)
+				logger.Log(t, "creating intentions in server peer")
+				_, _, err = staticServerPeerClient.ConfigEntries().Set(intention, &api.WriteOptions{})
+				require.NoError(t, err)
+			}
 
 			logger.Log(t, "checking that connection is successful")
 			if cfg.EnableTransparentProxy {

diff --git a/charts/consul/templates/server-acl-init-job.yaml b/charts/consul/templates/server-acl-init-job.yaml
@@ -185,6 +185,9 @@ spec:
                 -enable-partitions=true \
                 -partition={{ .Values.global.adminPartitions.name }} \
                 {{- end }}
+                {{- if .Values.global.peering.enabled }}
+                -enable-peering=true \
+                {{- end }}
                 {{- if (or (and (ne (.Values.dns.enabled | toString) "-") .Values.dns.enabled) (and (eq (.Values.dns.enabled | toString) "-") .Values.global.enabled)) }}
                 -allow-dns=true \
                 {{- end }}

diff --git a/charts/consul/templates/server-statefulset.yaml b/charts/consul/templates/server-statefulset.yaml
@@ -296,7 +296,6 @@ spec:
                 -config-dir=/consul/userconfig/{{ .name }} \
                 {{- end }}
                 {{- end }}
-                -hcl='ports { grpc = 8503 }' \
                 -config-file=/consul/extra-config/extra-from-values.json
           volumeMounts:
             - name: data-{{ .Release.Namespace | trunc 58 | trimSuffix "-" }}

diff --git a/charts/consul/test/unit/server-acl-init-job.bats b/charts/consul/test/unit/server-acl-init-job.bats
@@ -1386,6 +1386,36 @@ load _helpers
   [ "${actual}" = "true" ]
 }
 
+#--------------------------------------------------------------------
+# cluster peering
+
+@test "serverACLInit/Job: cluster peering disabled by default" {
+  cd `chart_dir`
+  local object=$(helm template \
+      -s templates/server-acl-init-job.yaml  \
+      --set 'global.acls.manageSystemACLs=true' \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec.containers[0].command' | tee /dev/stderr)
+
+  local actual=$(echo $object |
+    yq 'any(contains("enable-peering"))' | tee /dev/stderr)
+  [ "${actual}" = "false" ]
+}
+
+@test "serverACLInit/Job: cluster peering enabled when peering is enabled" {
+  cd `chart_dir`
+  local object=$(helm template \
+      -s templates/server-acl-init-job.yaml  \
+      --set 'global.acls.manageSystemACLs=true' \
+      --set 'global.peering.enabled=true' \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec.containers[0].command' | tee /dev/stderr)
+
+  local actual=$(echo $object |
+    yq 'any(contains("enable-peering"))' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
 #--------------------------------------------------------------------
 # admin partitions
 

diff --git a/control-plane/subcommand/server-acl-init/command.go b/control-plane/subcommand/server-acl-init/command.go
@@ -79,6 +79,9 @@ type Command struct {
 	flagPartitionName      string // name of the Admin Partition
 	flagPartitionTokenFile string
 
+	// Flags to support peering.
+	flagEnablePeering bool // true if Cluster Peering is enabled
+
 	// Flags to support namespaces.
 	flagEnableNamespaces                 bool   // Use namespacing on all components
 	flagConsulSyncDestinationNamespace   string // Consul namespace to register all catalog sync services into if not mirroring
@@ -181,6 +184,9 @@ func (c *Command) init() {
 	c.flags.StringVar(&c.flagPartitionTokenFile, "partition-token-file", "",
 		"[Enterprise Only] Path to file containing ACL token to be used in non-default partitions.")
 
+	c.flags.BoolVar(&c.flagEnablePeering, "enable-peering", false,
+		"Enables Cluster Peering.")
+
 	c.flags.BoolVar(&c.flagEnableNamespaces, "enable-namespaces", false,
 		"[Enterprise Only] Enables namespaces, in either a single Consul namespace or mirrored [Enterprise only feature]")
 	c.flags.StringVar(&c.flagConsulSyncDestinationNamespace, "consul-sync-destination-namespace", consulDefaultNamespace,