Commit 029881cb authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fixed labels

parent 8c44e432
Pipeline #5578 failed with stage
in 25 seconds
...@@ -3,7 +3,7 @@ kind: ConfigMap ...@@ -3,7 +3,7 @@ kind: ConfigMap
metadata: metadata:
name: {{ template "fullname" . }}-config name: {{ template "fullname" . }}-config
labels: labels:
{{- include "Yacy.labels" . | nindent 4 }} {{ include "sharedlabels" . | indent 4 }}
data: data:
yacy.init: | yacy.init: |
{{- if .Values.yacy.additionalConfig }} {{- if .Values.yacy.additionalConfig }}
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
"helm.sh/hook": "pre-install" "helm.sh/hook": "pre-install"
"helm.sh/hook-delete-policy": "before-hook-creation" "helm.sh/hook-delete-policy": "before-hook-creation"
labels: labels:
{{- include "Yacy.labels" . | nindent 4 }} {{ include "sharedlabels" . | indent 4 }}
data: data:
ADMIN_USER: {{ default "admin" .Values.yacy.admin.username | b64enc | quote }} ADMIN_USER: {{ default "admin" .Values.yacy.admin.username | b64enc | quote }}
ADMIN_REALM: {{ default "Yacy Admin UI" .Values.yacy.admin.realm | b64enc | quote }} ADMIN_REALM: {{ default "Yacy Admin UI" .Values.yacy.admin.realm | b64enc | quote }}
......
...@@ -3,7 +3,7 @@ kind: Service ...@@ -3,7 +3,7 @@ kind: Service
metadata: metadata:
name: {{ template "fullname" . }} name: {{ template "fullname" . }}
labels: labels:
{{- include "Yacy.labels" . | nindent 4 }} {{ include "sharedlabels" . | indent 4 }}
spec: spec:
type: NodePort type: NodePort
externalTrafficPolicy: Local externalTrafficPolicy: Local
...@@ -14,4 +14,7 @@ spec: ...@@ -14,4 +14,7 @@ spec:
protocol: TCP protocol: TCP
name: http name: http
selector: selector:
{{- include "Yacy.selectorLabels" . | nindent 4 }} app: {{ template "appname" . }}
tier: "{{ .Values.application.tier }}"
track: "{{ .Values.application.track }}"
...@@ -4,7 +4,7 @@ kind: ServiceAccount ...@@ -4,7 +4,7 @@ kind: ServiceAccount
metadata: metadata:
name: {{ include "Yacy.serviceAccountName" . }} name: {{ include "Yacy.serviceAccountName" . }}
labels: labels:
{{- include "Yacy.labels" . | nindent 4 }} {{ include "sharedlabels" . | indent 4 }}
{{- with .Values.serviceAccount.annotations }} {{- with .Values.serviceAccount.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
......
...@@ -4,13 +4,19 @@ metadata: ...@@ -4,13 +4,19 @@ metadata:
name: {{ template "trackableappname" . }} name: {{ template "trackableappname" . }}
labels: labels:
appname: yacy appname: yacy
{{- include "Yacy.labels" . | nindent 4 }} track: "{{ .Values.application.track }}"
tier: "{{ .Values.application.tier }}"
{{ include "sharedlabels" . | indent 4 }}
spec: spec:
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
serviceName: {{ template "fullname" . }} serviceName: {{ template "fullname" . }}
selector: selector:
matchLabels: matchLabels:
{{- include "Yacy.selectorLabels" . | nindent 6 }} matchLabels:
app: {{ template "appname" . }}
track: "{{ .Values.application.track }}"
tier: "{{ .Values.application.tier }}"
release: {{ .Release.Name }}
template: template:
metadata: metadata:
{{- with .Values.podAnnotations }} {{- with .Values.podAnnotations }}
......
...@@ -3,7 +3,7 @@ kind: Pod ...@@ -3,7 +3,7 @@ kind: Pod
metadata: metadata:
name: "{{ template "trackableappname" . }}-test-connection" name: "{{ template "trackableappname" . }}-test-connection"
labels: labels:
{{- include "Yacy.labels" . | nindent 4 }} {{ include "sharedlabels" . | indent 4 }}
annotations: annotations:
"helm.sh/hook": test "helm.sh/hook": test
spec: spec:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment