Fixed labels

This commit is contained in:
2023-09-23 13:41:10 +00:00
parent c514a76b5e
commit d6292ca4b0
3 changed files with 6 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
variables: variables:
HELM_CHART_VERSION: "1.0.20" HELM_CHART_VERSION: "1.0.21"
stages: stages:
- deploy - deploy

View File

@@ -48,8 +48,8 @@ cloudyne.systems/site: {{ .Values.site.domain | quote }}
{{- end }} {{- end }}
{{- define "..selector-labels" -}} {{- define "..selector-labels" -}}
cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }} cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
cloudyne.systems/site: {{ .Values.site.domain | quote }} cloudyne.systems/site: {{ .Values.site.domain | quote }}
cloudyne.systems/component: site
{{- end }} {{- end }}
{{- define "..affinity-labels" -}} {{- define "..affinity-labels" -}}
podAffinity: podAffinity:

View File

@@ -4,7 +4,6 @@ metadata:
name: {{ include "..fullname" . }} name: {{ include "..fullname" . }}
labels: labels:
{{- include "..labels" . | nindent 4 }} {{- include "..labels" . | nindent 4 }}
cloudyne.systems/component: site
spec: spec:
{{- if .Values.site.resources }} {{- if .Values.site.resources }}
replicas: {{ .Values.site.resources.replicas | default 1 }} replicas: {{ .Values.site.resources.replicas | default 1 }}
@@ -12,10 +11,12 @@ spec:
replicas: 1 replicas: 1
{{- end }} {{- end }}
selector: selector:
matchLabels: {{- include "..selector-labels" . | nindent 6 }} matchLabels:
{{- include "..selector-labels" . | nindent 6 }}
template: template:
metadata: metadata:
labels: {{- include "..selector-labels" . | nindent 8 }} labels:
{{- include "..selector-labels" . | nindent 8 }}
spec: spec:
securityContext: securityContext:
fsGroup: 101 fsGroup: 101