add service.labels and fix ingress service reference

The ingress was mistakenly pointed to the headless service required for maintaining the statefulset. This means that `service.annotations`, etc. were not useful for controlling ingress behavior.

It might be desirable to change service names at some point to indicate which is headless / internal. However, that could be a disruptive action to any existing environments.

couchdb/NEWS.md

@@ -0,0 +1,5 @@
+# development
+
+- Add `service.labels` value to pass along labels to the client-facing service
+- Update `ingress` to use the service created by `service.enabled=true`, instead of the headless service
+ - This allows setting `service.annotations`, `service.labels`, etc. in a way that will be picked up by the ingress

couchdb/templates/ingress.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- $serviceName := include "couchdb.fullname" . -}}
+{{- $serviceName := include "couchdb.svcname" . -}}
 {{- $servicePort := .Values.service.externalPort -}}
 {{- $path := .Values.ingress.path | quote -}}
 apiVersion: networking.k8s.io/v1

couchdb/templates/service.yaml

@@ -8,10 +8,13 @@ metadata:
  chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
  release: {{ .Release.Name }}
  heritage: {{ .Release.Service }}
-{{- if .Values.service.annotations }}
+ {{- with .Values.service.labels }}
+ {{- . | toYaml | nindent 4 }}
+ {{- end }}
+ {{- with .Values.service.annotations }}
  annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
-{{- end }}
+ {{- . | toYaml | nindent 4 }}
+ {{- end }}
 spec:
  ports:
  - port: {{ .Values.service.externalPort }}

couchdb/values.yaml

@@ -117,10 +117,11 @@ tolerations: []
 ## chart without any additional configuration. The Service block below refers
 ## to a second Service that governs how clients connect to the CouchDB cluster.
 service:
- # annotations:
+ annotations: {}
  enabled: true
  type: ClusterIP
  externalPort: 5984
+ labels: {}
 
 ## An Ingress resource can provide name-based virtual hosting and TLS
 ## termination among other things for CouchDB deployments which are accessed