a bit of refactoring

elastic · Sep 7, 2022 · d463940 · d463940
1 parent 451ea40
commit d463940
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/kibana/examples/security/test/goss.yaml b/kibana/examples/security/test/goss.yaml
@@ -12,8 +12,6 @@ file:
   /usr/share/kibana/config/kibana.yml:
     exists: true
     contains:
-      - 'elasticsearch.ssl.certificateAuthorities: ["/usr/share/kibana/config/certs/elastic-certificate.pem"]'
-      - "elasticsearch.ssl.verificationMode: certificate"
       - "server.ssl.certificate: /usr/share/kibana/config/certs/elastic-certificate.pem"
       - "server.ssl.enabled: true"
       - "server.ssl.key: /usr/share/kibana/config/certs/elastic-certificate.pem"

diff --git a/kibana/examples/security/values.yaml b/kibana/examples/security/values.yaml
@@ -13,8 +13,6 @@ extraEnvs:
 
 kibanaConfig:
   kibana.yml: |
-    elasticsearch.ssl.certificateAuthorities: ["/usr/share/kibana/config/certs/elastic-certificate.pem"]
-    elasticsearch.ssl.verificationMode: certificate
     server.ssl.certificate: /usr/share/kibana/config/certs/elastic-certificate.pem
     server.ssl.enabled: true
     server.ssl.key: /usr/share/kibana/config/certs/elastic-certificate.pem

diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
@@ -137,6 +137,12 @@ spec:
           - name: ELASTICSEARCH_HOSTS
             value: "{{ .Values.elasticsearchHosts }}"
           {{- end }}
+          - name: ELASTICSEARCH_SSL_CERTIFICATE
+            value: "{{ template "kibana.home_dir" . }}/config/certs/tls.crt"
+          - name: ELASTICSEARCH_SSL_KEY
+            value: "{{ template "kibana.home_dir" . }}/config/certs/tls.key"
+          - name: ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES
+            value: "{{ template "kibana.home_dir" . }}/config/certs/ca.crt"
           - name: SERVER_HOST
             value: "{{ .Values.serverHost }}"
 {{- if .Values.extraEnvs }}

diff --git a/kibana/values.yaml b/kibana/values.yaml
@@ -65,11 +65,10 @@ healthCheckPath: "/app/kibana"
 
 # Allows you to add any config files in /usr/share/kibana/config/
 # such as kibana.yml
-kibanaConfig:
-  kibana.yml: |
-    elasticsearch.ssl.certificate: /usr/share/kibana/config/certs/tls.crt
-    elasticsearch.ssl.key: /usr/share/kibana/config/certs/tls.key
-    elasticsearch.ssl.certificateAuthorities: ["/usr/share/kibana/config/certs/ca.crt"]
+kibanaConfig: {}
+#   kibana.yml: |
+#     key:
+#       nestedkey: value
 
 # If Pod Security Policy in use it may be required to specify security context as well as service account