Optional custom connectors-secret (#70)

* Optional custom connectors-secret * Bump the version to 1.1.12 Co-authored-by: Fatih Ulusoy <[email protected]>
valeriano-manassero · Jul 2, 2021 · 894cbde · 894cbde
1 parent f77d52a
commit 894cbde
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/valeriano-manassero/trino/Chart.yaml b/valeriano-manassero/trino/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "358"
 description: High performance, distributed SQL query engine for big data
 name: trino
-version: 1.1.11
+version: 1.1.12
 home: https://trino.io
 icon: https://trino.io/assets/images/trino-logo/trino-ko_tiny-alt.svg
 sources:

diff --git a/valeriano-manassero/trino/README.md b/valeriano-manassero/trino/README.md
@@ -1,6 +1,6 @@
 # trino
 
-![Version: 1.1.11](https://img.shields.io/badge/Version-1.1.11-informational?style=flat-square) ![AppVersion: 358](https://img.shields.io/badge/AppVersion-358-informational?style=flat-square)
+![Version: 1.1.12](https://img.shields.io/badge/Version-1.1.12-informational?style=flat-square) ![AppVersion: 358](https://img.shields.io/badge/AppVersion-358-informational?style=flat-square)
 
 High performance, distributed SQL query engine for big data
 

diff --git a/valeriano-manassero/trino/templates/deployment-coordinator.yaml b/valeriano-manassero/trino/templates/deployment-coordinator.yaml
@@ -16,7 +16,7 @@ spec:
         {{- include "trino.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: coordinator
       annotations:
-        checksum/config: {{ printf "%s%s" .Values.server .Values.connectors | sha256sum }}
+        checksum/config: {{ printf "%s%s" .Values.server .Values.connectors .Values.connectorsSecret | sha256sum }}
     spec:
       {{- with .Values.image.securityContext }}
       securityContext:
@@ -29,7 +29,7 @@ spec:
             name: {{ template "trino.coordinator" . }}
         - name: catalog-volume
           secret:
-            secretName: trino-connectors
+            secretName: {{ .Values.connectorsSecret | default "trino-connectors" }}
         - name: schemas-volume
           configMap:
             name: schemas-volume-coordinator

diff --git a/valeriano-manassero/trino/templates/deployment-worker.yaml b/valeriano-manassero/trino/templates/deployment-worker.yaml
@@ -18,7 +18,7 @@ spec:
         {{- include "trino.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: worker
       annotations:
-        checksum/config: {{ printf "%s%s" .Values.server .Values.connectors | sha256sum }}
+        checksum/config: {{ printf "%s%s" .Values.server .Values.connectors .Values.connectorsSecret | sha256sum }}
     spec:
       volumes:
         - name: config-volume
@@ -30,7 +30,7 @@ spec:
             defaultMode: 0777
         - name: catalog-volume
           secret:
-            secretName: trino-connectors
+            secretName: {{ .Values.connectorsSecret | default "trino-connectors" }}
         - name: schemas-volume
           configMap:
             name: schemas-volume-worker

diff --git a/valeriano-manassero/trino/templates/secret.yaml b/valeriano-manassero/trino/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.connectors }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,7 +9,7 @@ data:
   {{- range $key, $val := .Values.connectors }}
   {{ $key }}: {{ $val | b64enc | quote }}
   {{- end }}
-  
+{{- end }}
 ---
 {{- if .Values.server.config.authenticationType }}{{- if eq .Values.server.config.authenticationType "PASSWORD" }}
 apiVersion: v1

diff --git a/valeriano-manassero/trino/values.yaml b/valeriano-manassero/trino/values.yaml
@@ -108,6 +108,9 @@ accessControl: {}
   #       ]
   #     }
 
+# If you want to provide your own secrets resource, you can use this field:
+# connectorsSecret:
+
 connectors: {}
   # Connectors configuration usually contains sensitive data (like passwords, usernames, ...)
   # so data is stored in a secret