trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

helm: fix affinity rules and resources

This commit is contained in:
Jens Langhammer 2020-09-15 11:41:11 +02:00
parent 8c465b2026
commit 9b62a6403b
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
helm/templates/web-deployment.yaml
View File

@ -25,21 +25,23 @@ spec:
affinity: affinity:
podAntiAffinity: podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution: preferredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - weight: 1
matchExpressions: podAffinityTerm:
- key: app.kubernetes.io/name labelSelector:
operator: In matchExpressions:
values: - key: app.kubernetes.io/name
- {{ include "passbook.name" . }} operator: In
- key: app.kubernetes.io/instance values:
operator: In - {{ include "passbook.name" . }}
values: - key: app.kubernetes.io/instance
- {{ .Release.Name }} operator: In
- key: k8s.passbook.beryju.org/component values:
operator: In - {{ .Release.Name }}
values: - key: k8s.passbook.beryju.org/component
- web operator: In
topologyKey: "kubernetes.io/hostname" values:
- web
topologyKey: "kubernetes.io/hostname"
initContainers: initContainers:
- name: passbook-database-migrations - name: passbook-database-migrations
image: "{{ .Values.image.name }}:{{ .Values.image.tag }}" image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
@ -109,7 +111,7 @@ spec:
resources: resources:
requests: requests:
cpu: 100m cpu: 100m
memory: 200M memory: 300M
limits: limits:
cpu: 300m cpu: 300m
memory: 350M memory: 500M

36
helm/templates/worker-deployment.yaml
View File

@ -25,21 +25,23 @@ spec:
affinity: affinity:
podAntiAffinity: podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution: preferredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - weight: 1
matchExpressions: podAffinityTerm:
- key: app.kubernetes.io/name labelSelector:
operator: In matchExpressions:
values: - key: app.kubernetes.io/name
- {{ include "passbook.name" . }} operator: In
- key: app.kubernetes.io/instance values:
operator: In - {{ include "passbook.name" . }}
values: - key: app.kubernetes.io/instance
- {{ .Release.Name }} operator: In
- key: k8s.passbook.beryju.org/component values:
operator: In - {{ .Release.Name }}
values: - key: k8s.passbook.beryju.org/component
- worker operator: In
topologyKey: "kubernetes.io/hostname" values:
- worker
topologyKey: "kubernetes.io/hostname"
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.name }}:{{ .Values.image.tag }}" image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
@ -68,7 +70,7 @@ spec:
resources: resources:
requests: requests:
cpu: 150m cpu: 150m
memory: 300M memory: 400M
limits: limits:
cpu: 300m cpu: 300m
memory: 500M memory: 600M