Merge branch 'trinodb:main' into feature/trino_service

trinodb · Apr 17, 2024 · dae44a6 · dae44a6
2 parents df060a6 + 3d4268c
commit dae44a6
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,12 @@ Then you can install chart using:
 helm install my-trino trino/trino --version 0.19.0
 ```
 
+Also, you can check the manifests using: 
+
+```console
+helm template my-trino trino/trino --namespace <YOUR_NAMESPACE>
+```
+
 ## Documentation
 
 You can find documentation about the chart [here](./charts/trino/README.md).
diff --git a/charts/trino/templates/autoscaler.yaml b/charts/trino/templates/autoscaler.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "trino.worker" . }}
+  namespace: {{ .Release.Namespace }}
   {{- if .Values.commonLabels }}
   labels:
     {{- tpl (toYaml .Values.commonLabels) . | nindent 4 }}

diff --git a/charts/trino/templates/configmap-catalog.yaml b/charts/trino/templates/configmap-catalog.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "trino.catalog" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "trino.name" . }}
     chart: {{ template "trino.chart" . }}

diff --git a/charts/trino/templates/configmap-coordinator.yaml b/charts/trino/templates/configmap-coordinator.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "trino.coordinator" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "trino.name" . }}
     chart: {{ template "trino.chart" . }}
@@ -132,6 +133,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: trino-access-control-volume-coordinator
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}
     app.kubernetes.io/component: coordinator
@@ -162,6 +164,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: schemas-volume-coordinator
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}
     app.kubernetes.io/component: coordinator

diff --git a/charts/trino/templates/configmap-worker.yaml b/charts/trino/templates/configmap-worker.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "trino.worker" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "trino.name" . }}
     chart: {{ template "trino.chart" . }}
@@ -90,6 +91,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: schemas-volume-worker
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}
     app.kubernetes.io/component: worker

diff --git a/charts/trino/templates/deployment-coordinator.yaml b/charts/trino/templates/deployment-coordinator.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "trino.coordinator" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "trino.name" . }}
     chart: {{ template "trino.chart" . }}
@@ -63,7 +64,7 @@ spec:
           configMap:
             name: trino-resource-groups-volume-coordinator
         {{- end }}
-        {{- if or .Values.auth.passwordAuth .Values.auth.groups }}
+        {{- if or .Values.auth.passwordAuth .Values.auth.passwordAuthSecret .Values.auth.groups }}
         - name: file-authentication-volume
           secret:
             {{- if and .Values.auth .Values.auth.passwordAuthSecret }}
@@ -72,7 +73,7 @@ spec:
             secretName: trino-file-authentication
             {{- end }}
             items:
-              {{- if .Values.auth.passwordAuth }}
+              {{- if or .Values.auth.passwordAuth .Values.auth.passwordAuthSecret }}
               - key: password.db
                 path: password.db
               {{- end }} 
@@ -133,7 +134,7 @@ spec:
             - name: {{ .name }}
               mountPath: {{ .path }}
             {{- end }}
-            {{- if or .Values.auth.passwordAuth .Values.auth.groups }}
+            {{- if or .Values.auth.passwordAuth .Values.auth.passwordAuthSecret .Values.auth.groups }}
             - mountPath: {{ .Values.server.config.path }}/auth
               name: file-authentication-volume
             {{- end }}

diff --git a/charts/trino/templates/deployment-worker.yaml b/charts/trino/templates/deployment-worker.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "trino.worker" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "trino.name" . }}
     chart: {{ template "trino.chart" . }}

diff --git a/charts/trino/templates/ingress.yaml b/charts/trino/templates/ingress.yaml
@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "trino.coordinator" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}

diff --git a/charts/trino/templates/secret.yaml b/charts/trino/templates/secret.yaml
@@ -7,6 +7,7 @@ metadata:
   {{- else }}
   name: trino-file-authentication
   {{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}

diff --git a/charts/trino/templates/service.yaml b/charts/trino/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "trino.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "trino.name" . }}
     chart: {{ template "trino.chart" . }}

diff --git a/charts/trino/templates/serviceaccount.yaml b/charts/trino/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "trino.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "trino.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}