diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e12f6a..ed1059d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - HELM_CHART_VERSION: "1.0.16" + HELM_CHART_VERSION: "1.0.17" stages: - deploy diff --git a/Chart/templates/_helpers.tpl b/Chart/templates/_helpers.tpl index 7dc7aa3..607019d 100644 --- a/Chart/templates/_helpers.tpl +++ b/Chart/templates/_helpers.tpl @@ -54,19 +54,19 @@ cloudyne.systems/site: {{ .Values.site.domain | quote }} {{- define "..affinity-labels" -}} podAffinity: requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: - labelSelector: matchExpressions: - - key: cloudyne.systems/customer - operator: In - values: - - {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }} - - key: cloudyne.systems/site - operator: In - values: - - cloudyne.systems/site: {{ .Values.site.domain | quote }} - - key: cloudyne.systems/component - operator: In - values: - - "site" - topologyKey: kubernetes.io/hostname + - key: cloudyne.systems/customer + operator: In + values: + - {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }} + - key: cloudyne.systems/site + operator: In + values: + - {{ .Values.site.domain | quote }} + - key: cloudyne.systems/component + operator: In + values: + - "site" {{- end }} diff --git a/Chart/templates/job.yaml b/Chart/templates/job.yaml index 6be1de1..c604b54 100644 --- a/Chart/templates/job.yaml +++ b/Chart/templates/job.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ include "..fullname" . }}-wpc-reg + name: {{ include "..fullname" . }}-initializer labels: {{- include "..labels" . | nindent 4 }} cloudyne.systems/component: site-init