add hostIP as env to server-statefulset and substitute env variables …

…in extraConfig (#1042)

* add host_ip as an env variable, evaluate HOST_IP/POD_IP/HOSTNAME at runtime and add new config file for server and client

Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com>

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Unreleased
 
 IMPROVEMENTS:
+* Substitute `HOST_IP/POD_IP/HOSTNAME` variables in `server.extraConfig` and `client.extraConfig` so they are passed in to server/client config already evaluated at runtime. [[GH-1042](https://github.com/hashicorp/consul-helm/pull/1042)]
 * Set failurePolicy to Fail for connectInject mutating webhook so that pods fail to schedule when the webhook is offline. This can be controlled via `connectInject.failurePolicy`. [[GH-1024](https://github.com/hashicorp/consul-helm/pull/1024)]
 * Allow setting global.logLevel and global.logJSON and propogate this to all consul-k8s commands. [[GH-980](https://github.com/hashicorp/consul-helm/pull/980)]
 * Allow setting `connectInject.replicas` to control number of replicas of webhook injector. [[GH-1029](https://github.com/hashicorp/consul-helm/pull/1029)]

templates/_helpers.tpl

@@ -15,6 +15,20 @@ as well as the global.name setting.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Sets up the extra-from-values config file passed to consul and then uses sed to do any necessary
+substitution for HOST_IP/POD_IP/HOSTNAME. Useful for dogstats telemetry. The output file
+is passed to consul as a -config-file param on command line.
+*/}}
+{{- define "consul.extraconfig" -}}
+              mkdir -p /consul/extra-config
+              cp /consul/config/extra-from-values.json /consul/extra-config/extra-from-values.json
+              [ -n "${HOST_IP}" ] && sed -Ei "s|HOST_IP|${HOST_IP?}|g" /consul/extra-config/extra-from-values.json
+              [ -n "${POD_IP}" ] && sed -Ei "s|POD_IP|${POD_IP?}|g" /consul/extra-config/extra-from-values.json
+              [ -n "${HOSTNAME}" ] && sed -Ei "s|HOSTNAME|${HOSTNAME?}|g" /consul/extra-config/extra-from-values.json
+{{- end -}}
+
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

templates/client-daemonset.yaml

@@ -193,6 +193,8 @@ spec:
             - |
               CONSUL_FULLNAME="{{template "consul.fullname" . }}"
 
+              {{ template "consul.extraconfig" }}
+
               exec /bin/consul agent \
                 -node="${NODE}" \
                 -advertise="${ADVERTISE_IP}" \
@@ -261,6 +263,7 @@ spec:
                 {{- range $value := .Values.global.recursors }}
                 -recursor={{ quote $value }} \
                 {{- end }}
+                -config-file=/consul/extra-config/extra-from-values.json \
                 -domain={{ .Values.global.domain }}
           volumeMounts:
             - name: data

templates/server-statefulset.yaml

@@ -137,6 +137,10 @@ spec:
                   {{- else }}
                   fieldPath: status.podIP
                   {{- end }}
+            - name: HOST_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
             - name: POD_IP
               valueFrom:
                 fieldRef:
@@ -176,6 +180,8 @@ spec:
             - |
               CONSUL_FULLNAME="{{template "consul.fullname" . }}"
 
+              {{ template "consul.extraconfig" }}
+
               exec /bin/consul agent \
                 -advertise="${ADVERTISE_IP}" \
                 -bind=0.0.0.0 \
@@ -236,6 +242,7 @@ spec:
                 {{- range $value := .Values.global.recursors }}
                 -recursor={{ quote $value }} \
                 {{- end }}
+                -config-file=/consul/extra-config/extra-from-values.json \
                 -server
           volumeMounts:
             - name: data-{{ .Release.Namespace }}

test/unit/server-statefulset.bats

@@ -837,19 +837,19 @@ load _helpers
       yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
 
   local actual=$(echo $object |
-      yq -r '.[3].name' | tee /dev/stderr)
+      yq -r '.[4].name' | tee /dev/stderr)
   [ "${actual}" = "custom_proxy" ]
 
   local actual=$(echo $object |
-      yq -r '.[3].value' | tee /dev/stderr)
+      yq -r '.[4].value' | tee /dev/stderr)
   [ "${actual}" = "fakeproxy" ]
 
   local actual=$(echo $object |
-      yq -r '.[4].name' | tee /dev/stderr)
+      yq -r '.[5].name' | tee /dev/stderr)
   [ "${actual}" = "no_proxy" ]
 
   local actual=$(echo $object |
-      yq -r '.[4].value' | tee /dev/stderr)
+      yq -r '.[5].value' | tee /dev/stderr)
   [ "${actual}" = "custom_no_proxy" ]
 }