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.

Sign up for GitHub

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

Jump to bottom

Bug 1809005: Always set node selector kubernetes.io/os to linux #518

Merged
merged 1 commit into from
May 12, 2020
Merged

Bug 1809005: Always set node selector kubernetes.io/os to linux #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion pkg/resource/podtemplatespec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,21 @@ func makePodTemplateSpec(coreClient coreset.CoreV1Interface, proxyLister configl
}
}

nodeSelectors := map[string]string{}
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure how I feel about this. The image registry has to run on linux, but we are saying that an administrator can set a different os, even if it won't run there? Seems sketchy.

Copy link
Member

Choose a reason for hiding this comment

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

Settings kubernetes.io/os in this selector to anything other than linux is not supported today. However, if a customer decides to change its value anyway, the configuration should be broken today.

I can envision a situation when someone sets kubernetes.io/os to windows and forget about it, it works. Later we add support of this OS and his configuration suddenly has a new meaning.

Copy link
Contributor

Choose a reason for hiding this comment

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

Settings kubernetes.io/os in this selector to anything other than linux is not supported today

I don't think that is true. We are moving towards supporting Windows Containers (and that means Windows nodes) in the near future. My understanding is that this is "dev preview" in 4.4.

Copy link
Member

Choose a reason for hiding this comment

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

@adambkaplan are you saying that someone is trying to build the image registry for Windows?

Copy link
Contributor

Choose a reason for hiding this comment

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

@dmage - at this point no, just that there will be Windows workers and we need to ensure we don't schedule or workloads on them by default. If a customer sets the node selector to be windows, their cluster goes degraded. So 🤷

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree with @dmage. It is better to crash with a wrong configuration now. This way we assure that the configuration reflects user intentions once we start supporting Window hosts.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey guys, any extra consideration here? I would like to get this moving ahead.

for k, v := range cr.Spec.NodeSelector {
nodeSelectors[k] = v
}
if _, ok := nodeSelectors["kubernetes.io/os"]; !ok {
nodeSelectors["kubernetes.io/os"] = "linux"
}

spec := corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: defaults.DeploymentLabels,
},
Spec: corev1.PodSpec{
Tolerations: cr.Spec.Tolerations,
NodeSelector: cr.Spec.NodeSelector,
NodeSelector: nodeSelectors,
PriorityClassName: "system-cluster-critical",
Containers: []corev1.Container{
{
Expand Down