Fluentd: Change elasticsearch endpoint port and creds reference

Updates the fluent-logging chart to reference the elasticsearch
endpoint via lookups on the `http` port to match the elasticsearch
chart's handling of the client port.  This also updates the helm
test pod to reference the elasticsearch credentials via the
secret used elsewhere in the fluent-logging chart

Change-Id: I352d912db5e231e14dc58cdf897ae642f3256373

fluent-logging/templates/deployment-fluentd.yaml

@@ -120,7 +120,7 @@ spec:
             - name: ELASTICSEARCH_HOST
               value: {{ tuple "elasticsearch" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
             - name: ELASTICSEARCH_PORT
-              value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
+              value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
             - name: ELASTICSEARCH_USERNAME
               valueFrom:
                 secretKeyRef:

fluent-logging/templates/job-elasticsearch-template.yaml

@@ -16,6 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_elasticsearch_template }}
 {{- $envAll := . }}
+{{- $esUserSecret := .Values.secrets.elasticsearch.user }}
 {{- $dependencies := .Values.dependencies.static.elasticsearch_template }}
 {{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }}
 {{- $mounts_elasticsearch_template_init := .Values.pod.mounts.elasticsearch_template.init_container }}
@@ -44,11 +45,17 @@ spec:
             - name: ELASTICSEARCH_HOST
               value: {{ tuple "elasticsearch" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
             - name: ELASTICSEARCH_PORT
-              value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
+              value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
             - name: ELASTICSEARCH_USERNAME
-              value: {{ .Values.endpoints.elasticsearch.auth.admin.username }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $esUserSecret }}
+                  key: ELASTICSEARCH_USERNAME
             - name: ELASTICSEARCH_PASSWORD
-              value: {{ .Values.endpoints.elasticsearch.auth.admin.password }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $esUserSecret }}
+                  key: ELASTICSEARCH_PASSWORD
           command:
             - /tmp/create_template.sh
           volumeMounts:

fluent-logging/templates/pod-helm-tests.yaml

@@ -43,7 +43,7 @@ spec:
             name: {{ $esUserSecret }}
             key: ELASTICSEARCH_PASSWORD
       - name: ELASTICSEARCH_ENDPOINT
-        value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
+        value: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
       volumeMounts:
       - name: fluent-logging-bin
         mountPath: /tmp/helm-tests.sh

fluent-logging/values.yaml

@@ -232,10 +232,8 @@ endpoints:
     scheme:
       default: http
     port:
-      client:
+      http:
         default: 80
-      discovery:
-        default: 9300
   kafka:
     namespace: null
     name: kafka