add comment to test. remove extra lines from config map.

hashicorp · Dec 12, 2023 · a083657 · a083657
1 parent a91564b
commit a083657
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/acceptance/tests/segments/segments_test.go b/acceptance/tests/segments/segments_test.go
@@ -40,7 +40,9 @@ func TestSegments_MeshWithAgentfulClients(t *testing.T) {
 				"server.replicas":    "3",
 				"server.extraConfig": `"{\"segments\": [{\"name\":\"alpha1\"\,\"bind\":\"0.0.0.0\"\,\"port\":8303}]}"`,
 
-				"client.enabled":     "true",
+				"client.enabled": "true",
+				// need to configure clients to connect to port 8303 that the alpha segment was configured on rather than
+				// the standard serf LAN port.
 				"client.join[0]":     "${CONSUL_FULLNAME}-server-0.${CONSUL_FULLNAME}-server.${NAMESPACE}.svc:8303",
 				"client.join[1]":     "${CONSUL_FULLNAME}-server-1.${CONSUL_FULLNAME}-server.${NAMESPACE}.svc:8303",
 				"client.join[2]":     "${CONSUL_FULLNAME}-server-2.${CONSUL_FULLNAME}-server.${NAMESPACE}.svc:8303",

diff --git a/charts/consul/templates/client-config-configmap.yaml b/charts/consul/templates/client-config-configmap.yaml
@@ -25,12 +25,10 @@ data:
       "log_level": "{{ .Values.client.logLevel | upper }}"
       {{- end }}
     }
-
   central-config.json: |-
     {
       "enable_central_service_config": true
     }
-
   {{- if .Values.connectInject.enabled }}
   {{/* We set check_update_interval to 0s so that check output is immediately viewable
        in the UI. */}}