Fixing config path in opensearch-dashboards (opensearch-project#38)

* Fixing config path in opensearch-dashboards The manifests rendered by the Helm chart place the user provided config into the incorrect directory. This simply updates that location to the correct path and updates the values.yaml file to use the correct default config file so that the user provided setting override the defaults. Signed-off-by: Harrison Goscenski <[email protected]> * Updating cert paths to opensearch-dashboards Cert paths also need to utilize new filesystem location for opensearch-dashboards config. Signed-off-by: Harrison Goscenski <[email protected]>
banzaicloud · Aug 24, 2021 · 220a62f · 220a62f
1 parent fe831db
commit 220a62f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/Helm/opensearch-dashboards/templates/deployment.yaml b/Helm/opensearch-dashboards/templates/deployment.yaml
@@ -143,7 +143,7 @@ spec:
           {{- end }}
           {{- range $path, $config := .Values.config }}
           - name: config
-            mountPath: /usr/share/dashboards/config/{{ $path }}
+            mountPath: /usr/share/opensearch-dashboards/config/{{ $path }}
             subPath: {{ $path }}
           {{- end }}
       {{- if .Values.extraContainers }}

diff --git a/Helm/opensearch-dashboards/values.yaml b/Helm/opensearch-dashboards/values.yaml
@@ -25,7 +25,6 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-
 rbac:
   create: true
 
@@ -59,23 +58,21 @@ securityContext:
   runAsNonRoot: true
   runAsUser: 1000
 
-
 config:
-  dashboards.yml:
+  opensearch_dashboards.yml:
     server:
-        name: dashboards
-        host: 0.0.0.0
+      name: dashboards
+      host: 0.0.0.0
 
-    ## Dashboards TLS Config
-        ssl:
-          enabled: false
-          key: /usr/share/dashboards/certs/dashboards-key.pem
-          certificate: /usr/share/dashboards/certs/dashboards-crt.pem
-    opensearch.ssl.certificateAuthorities: /usr/share/dashboards/certs/dashboards-root-ca.pem
+      ## Dashboards TLS Config
+      ssl:
+        enabled: false
+        key: /usr/share/opensearch-dashboards/certs/dashboards-key.pem
+        certificate: /usr/share/opensearch-dashboards/certs/dashboards-crt.pem
+    opensearch.ssl.certificateAuthorities: /usr/share/opensearch-dashboards/certs/dashboards-root-ca.pem
 
 priorityClassName: ""
 
-
 opensearchAccount:
   secret: ""
   keyPassphrase:
@@ -104,22 +101,22 @@ service:
 
 ingress:
   enabled: false
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
     - host: chart-example.local
       paths:
-      - path: /
-        backend:
-          serviceName: chart-example.local
-          servicePort: 80
+        - path: /
+          backend:
+            serviceName: chart-example.local
+            servicePort: 80
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
 
-
 resources:
   requests:
     cpu: "100m"