[influxdb-enterprise] add annotations to data.service (#426)

* add annotations to influxdb-enterprise/data-service * bump influxdb-enterprise chart version bump influxdb-enterprise chart version to v0.1.16 * adding annotations to meta.service as proposed by tomklapka also meta services should have the option to have annotations https://github.com/influxdata/helm-charts/pull/426#issuecomment-1050005446 * Update values.yaml adding commet on meta.service.annotations * Update meta-service.yaml adding missing {{- end }} * fixing serve.annotations in values.yaml influxdb-enterprise commenting in "annotations: {}" for data.service: and meta.service to prevent nil pointer evaluating * adding meta.service.type to value.yaml for influxdb-enterprise: adding meta.service.type to value.yaml to align with data.service: commenting out service.annotations because now service has at least the type element, so no nil rendering should occure

[influxdb-enterprise] add annotations to data.service (#426)
135747bb · olibal · GitHub · 7229c408 · 135747bb · 135747bb
Unverified Commit 135747bb authored Mar 08, 2022 by olibal Committed by GitHub Mar 08, 2022
4 changed files
--- a/charts/influxdb-enterprise/Chart.yaml
+++ b/charts/influxdb-enterprise/Chart.yaml
 apiVersion: v1
-version: 0.1.15
+version: 0.1.16
 appVersion: 1.9.6
 engine: gotpl


--- a/charts/influxdb-enterprise/templates/data-service.yaml
+++ b/charts/influxdb-enterprise/templates/data-service.yaml
 apiVersion: v1
 kind: Service
 metadata:
+{{- if .Values.data.service.annotations }}
+  annotations:
+{{ toYaml .Values.data.service.annotations | indent 4 }}
+{{- end }}
  name: {{ template "influxdb-enterprise.fullname" . }}-data
  labels:
    influxdb.influxdata.com/component: data

--- a/charts/influxdb-enterprise/templates/meta-service.yaml
+++ b/charts/influxdb-enterprise/templates/meta-service.yaml
 apiVersion: v1
 kind: Service
 metadata:
+{{- if .Values.meta.service.annotations }}
+  annotations:
+{{ toYaml .Values.meta.service.annotations | indent 4 }}
+{{- end }}
  name: {{ template "influxdb-enterprise.fullname" . }}-meta
  labels:
    influxdb.influxdata.com/component: meta

--- a/charts/influxdb-enterprise/values.yaml
+++ b/charts/influxdb-enterprise/values.yaml
@@ -112,8 +112,15 @@ meta:
  sharedSecret:
    secretName: influxdb-shared-secret
  #
+  service:
+    ## Specify a service type
+    ## ClusterIP is default
+    ## ref: http://kubernetes.io/docs/user-guide/services/
+    type: ClusterIP
+    ## Add annotations to service
+    # annotations: {}
+  #
  ## Persist data to a persistent volume
-  ##
  persistence:
    enabled: false
    ## A manually managed Persistent Volume and Claim
@@ -200,22 +207,18 @@ data:
  #   - cmd: stat $HOME/somefile
  #     description: And we run a second command
  #
-  ## Persist data to a persistent volume
-  ##
-  ## Specify a service type
-  ## NodePort is default
-  ## ref: http://kubernetes.io/docs/user-guide/services/
-  ##
  service:
    ## Specify a service type
    ## ClusterIP is default
    ## ref: http://kubernetes.io/docs/user-guide/services/
-    ## Add annotations to service
-    # annotations: {}
    type: ClusterIP
    # loadBalancerIP: ""
    # externalIPs: []
    # externalTrafficPolicy: ""
+    ## Add annotations to service
+    # annotations: {}
+  #
+  ## Persist data to a persistent volume
  persistence:
    enabled: false
    ## A manually managed Persistent Volume and Claim