Add support to configure annotations on services in drill helm chart (#…

…28) * Add support to configure annotations on services * bump version * conditionally enable custom logging
wearefrank · Nov 15, 2024 · e541cc1 · e541cc1
1 parent c1976b8
commit e541cc1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/charts/drill/Chart.yaml b/charts/drill/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: drill
-version: 1.3.4
+version: 1.3.5
 appVersion: 1.21.1
 description: Helm Charts for deploying Apache Drill Clusters on Kubernetes
 icon: https://raw.githubusercontent.com/wearefrank/charts/master/charts/drill/icon.svg

diff --git a/charts/drill/templates/configmap.override.yaml b/charts/drill/templates/configmap.override.yaml
@@ -31,6 +31,7 @@ data:
   storage-plugins-override.conf: |-
     {{- toString . | nindent 4 }}
   {{- end }}
+  {{- if .Values.drill.overrideLogging.enabled }}
   logback.xml: |-
     <configuration>
       <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -58,3 +59,4 @@ data:
       <logger name="{{ .name }}" level="{{ .level | default "trace" }}"/>
       {{- end }}
     </configuration>
+  {{- end }}
diff --git a/charts/drill/templates/service.yaml b/charts/drill/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "drill.fullname" . }}-web
   labels:
     {{- include "drill.labels" . | nindent 4 }}
+  {{- with .Values.service.web.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   sessionAffinity: ClientIP
   ports:
@@ -20,6 +24,10 @@ metadata:
   name: {{ include "drill.fullname" . }}-user
   labels:
     {{- include "drill.labels" . | nindent 4 }}
+  {{- with .Values.service.user.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   sessionAffinity: ClientIP
   ports:

diff --git a/charts/drill/values.yaml b/charts/drill/values.yaml
@@ -149,13 +149,15 @@ service:
   web:
     type: ClusterIP
     port: 80
+    annotations: { }
   ## Drill User Api for external client, such as Tableau, to connect into the cluster nodes.
   ## @param service.user.type Drill User Api service type
   ## @param service.user.port Drill User Api service port
   ##
   user:
     type: ClusterIP
     port: 31010
+    annotations: { }
 
 ## Configure the ingress resource that allows you to access the Drill Web UI
 ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/