Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bind coredns containers to linux nodes to avoid Windows scheduling #69940

Merged
merged 1 commit into from
Jan 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cluster/addons/dns/coredns/coredns.yaml.base
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ spec:
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
MarcPow marked this conversation as resolved.
Show resolved Hide resolved
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.4
Expand Down
2 changes: 2 additions & 0 deletions cluster/addons/dns/coredns/coredns.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ spec:
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
MarcPow marked this conversation as resolved.
Show resolved Hide resolved
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.4
Expand Down
2 changes: 2 additions & 0 deletions cluster/addons/dns/coredns/coredns.yaml.sed
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ spec:
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.4
Expand Down
2 changes: 2 additions & 0 deletions cmd/kubeadm/app/phases/addons/dns/manifests.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ spec:
operator: Exists
- key: {{ .MasterTaintKey }}
effect: NoSchedule
nodeSelector:
beta.kubernetes.io/os: linux
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are the docs that outline this is how we are planning todo hostOS steering? It's weird to use labels for things that need to be enforced.

Copy link
Contributor Author

@MarcPow MarcPow Nov 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The os node labels are automatically injected.

But if you're suggesting this should be less manual, that's a fair point - I'd love to see the scheduler to inspect the relevant images and dynamically impose these constraints. But in the absence of such a feature, this seems like a reasonable place to start.

Copy link
Member

@neolit123 neolit123 Nov 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably best to have an issue in the k/kubeadm repo about this and add a TODO comment in the code if this change is to make it in.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brendanburns - ping! What's the policy you are using for denoting windows nodes? and is there a KEP somewhere?

/cc @jbeda

containers:
- name: coredns
image: {{ .ImageRepository }}/coredns:{{ .Version }}
Expand Down