Adding -use-https flag to client-daemonset.yaml when externalServers …

…are enabled
hashicorp · Mar 14, 2022 · 818a5db · 818a5db
1 parent c6072a1
commit 818a5db
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/charts/consul/templates/client-daemonset.yaml b/charts/consul/templates/client-daemonset.yaml
@@ -478,10 +478,16 @@ spec:
           value: "/consul/tls/ca/tls.crt"
           {{- end }}
         {{- end }}
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         command:
           - "/bin/sh"
           - "-ec"
           - |
+            CONSUL_FULLNAME="{{template "consul.fullname" . }}"
+
             consul-k8s-control-plane acl-init \
               -component-name=client \
               -acl-auth-method="{{ template "consul.fullname" . }}-k8s-component-auth-method" \
@@ -490,20 +496,19 @@ spec:
               {{- end }}
               -log-level={{ default .Values.global.logLevel .Values.client.logLevel }} \
               -log-json={{ .Values.global.logJSON }} \
-              -init-type="client" \
               {{- if .Values.externalServers.enabled }}
+              {{- if .Values.global.tls.enabled }}
+              -use-https \
+              {{- end }}
               {{- range .Values.externalServers.hosts }}
               -server-address={{ quote . }} \
               {{- end }}
               -server-port={{ .Values.externalServers.httpsPort }} \
               {{- if .Values.externalServers.tlsServerName }}
-                -tls-server-name={{ .Values.externalServers.tlsServerName }} \
-              {{- end }}
-              {{- else }}
-              {{- range $index := until (.Values.server.replicas | int) }}
-              -server-address="${CONSUL_FULLNAME}-server-{{ $index }}.${CONSUL_FULLNAME}-server.${NAMESPACE}.svc" \
+              -tls-server-name={{ .Values.externalServers.tlsServerName }} \
               {{- end }}
               {{- end }}
+              -init-type="client"
         volumeMounts:
           - name: aclconfig
             mountPath: /consul/aclconfig

diff --git a/charts/consul/test/unit/client-daemonset.bats b/charts/consul/test/unit/client-daemonset.bats
@@ -1355,6 +1355,7 @@ local actual=$(echo $object |
   local command=$(helm template \
       -s templates/client-daemonset.yaml  \
       --set 'global.acls.manageSystemACLs=true' \
+      --set 'global.tls.enabled=true'  \
       --set 'externalServers.enabled=true'  \
       --set 'server.enabled=false' \
       --set 'externalServers.hosts[0]=computer'  \

diff --git a/control-plane/subcommand/acl-init/command.go b/control-plane/subcommand/acl-init/command.go
@@ -177,10 +177,8 @@ func (c *Command) Run(args []string) int {
 			}
 			// For all of the next operations we'll need a Consul client.
 			serverAddr := fmt.Sprintf("%s:%d", serverAddresses[0], c.flagServerPort)
-			c.http.MergeOntoConfig(&api.Config{
-				Address: serverAddr,
-				Scheme:  scheme,
-			})
+			cfg.Address = serverAddr
+			cfg.Scheme = scheme
 		}
 
 		c.consulClient, err = consul.NewClient(cfg)