Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Adds nodeSelector to deployment templates for mixed OS clusters #2692

Merged
merged 3 commits into from
Dec 17, 2019
Merged

Adds nodeSelector to deployment templates for mixed OS clusters #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9c8e04
nodeSelector to deployment templates for mixed OS
rparsonsbb Dec 14, 2019
86d14bf
adds default os nodeselector to helm chart
rparsonsbb Dec 17, 2019
8db03a4
"make generate-deploy" results
rparsonsbb Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions chart/flux/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,9 @@ spec:
dnsConfig:
{{ toYaml .Values.dnsConfig | indent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
nodeSelector:
beta.kubernetes.io/os: linux
{{- with .Values.nodeSelector }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.affinity }}
Expand Down
3 changes: 2 additions & 1 deletion chart/flux/templates/memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ spec:
{{ toYaml .Values.memcached.resources | indent 10 }}
securityContext:
{{ toYaml .Values.memcached.securityContext | indent 10 }}
{{- with .Values.memcached.nodeSelector }}
nodeSelector:
beta.kubernetes.io/os: linux
{{- with .Values.memcached.nodeSelector }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.memcached.affinity }}
Expand Down
2 changes: 2 additions & 0 deletions deploy/flux-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ spec:
labels:
name: flux
spec:
nodeSelector:
beta.kubernetes.io/os: linux
serviceAccountName: flux
volumes:
- name: git-key
Expand Down
2 changes: 2 additions & 0 deletions deploy/memcache-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ spec:
labels:
name: memcached
spec:
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: memcached
image: memcached:1.5.20
Expand Down
8 changes: 4 additions & 4 deletions pkg/install/generated_templates.gogen.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkg/install/templates/flux-deployment.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ spec:
labels:
name: flux
spec:
nodeSelector:
beta.kubernetes.io/os: linux
serviceAccountName: flux
volumes:
- name: git-key
Expand Down
2 changes: 2 additions & 0 deletions pkg/install/templates/memcache-dep.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ spec:
labels:
name: memcached
spec:
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: memcached
image: memcached:1.5.20
Expand Down