fixed labels

yacy/templates/configmap.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ template "fullname" . }}-config
   labels:
-    {{- include "Yacy.labels" . | nindent 4 }}
+    {{ include "sharedlabels" . | indent 4 }}
 data:
   yacy.init: |
     {{- if .Values.yacy.additionalConfig }}

yacy/templates/secret.yaml

@@ -6,7 +6,7 @@ metadata:
     "helm.sh/hook": "pre-install"
     "helm.sh/hook-delete-policy": "before-hook-creation"
   labels:
-    {{- include "Yacy.labels" . | nindent 4 }}
+    {{ include "sharedlabels" . | indent 4 }}
 data:
   ADMIN_USER: {{ default "admin" .Values.yacy.admin.username | b64enc | quote }}
   ADMIN_REALM: {{ default "Yacy Admin UI" .Values.yacy.admin.realm | b64enc | quote }}

yacy/templates/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ template "fullname" . }}
   labels:
-    {{- include "Yacy.labels" . | nindent 4 }}
+    {{ include "sharedlabels" . | indent 4 }}
 spec:
   type: NodePort
   externalTrafficPolicy: Local
@@ -14,4 +14,7 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "Yacy.selectorLabels" . | nindent 4 }}
+    app: {{ template "appname" . }}
+    tier: "{{ .Values.application.tier }}"
+    track: "{{ .Values.application.track }}"
+

yacy/templates/serviceaccount.yaml

@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "Yacy.serviceAccountName" . }}
   labels:
-    {{- include "Yacy.labels" . | nindent 4 }}
+    {{ include "sharedlabels" . | indent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

yacy/templates/statefulset.yaml

@@ -4,13 +4,19 @@ metadata:
   name: {{ template "trackableappname" . }}
   labels:
     appname: yacy
-    {{- include "Yacy.labels" . | nindent 4 }}
+    track: "{{ .Values.application.track }}"
+    tier: "{{ .Values.application.tier }}"
+    {{ include "sharedlabels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   serviceName: {{ template "fullname" . }}
   selector:
     matchLabels:
-      {{- include "Yacy.selectorLabels" . | nindent 6 }}
+      matchLabels:
+        app: {{ template "appname" . }}
+        track: "{{ .Values.application.track }}"
+        tier: "{{ .Values.application.tier }}"
+        release: {{ .Release.Name }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}

yacy/templates/tests/test-connection.yaml

@@ -3,7 +3,7 @@ kind: Pod
 metadata:
   name: "{{ template "trackableappname" . }}-test-connection"
   labels:
-    {{- include "Yacy.labels" . | nindent 4 }}
+    {{ include "sharedlabels" . | indent 4 }}
   annotations:
     "helm.sh/hook": test
 spec: