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

Clean up self-set node labels #74424

Merged
merged 6 commits into from
Mar 6, 2019

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Feb 22, 2019

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Starts to clean up self-set kubelet labels under k8s.io prefixes:

  • removes fluentd node selector to complete migration to daemonset
  • starts the process of switching the beta.kubernetes.io/metadata-proxy-ready label to a cloud.google.com/metadata-proxy-ready label by adding the label to new nodes and labeling existing nodes on upgrade
  • starts the process of switching the beta.kubernetes.io/kube-proxy-ds-ready label to a node.kubernetes.io/kube-proxy-ds-ready label by adding the label to new nodes and labeling existing nodes on upgrade
  • starts the process of switching the beta.kubernetes.io/masq-agent-ds-ready label to a node.kubernetes.io/masq-agent-ds-ready label by adding the label to new nodes and labeling existing nodes on upgrade

This is related to https://github.com/kubernetes/enhancements/blob/master/keps/sig-auth/0000-20170814-bounding-self-labeling-kubelets.md#implementation-timeline

Does this PR introduce a user-facing change?:

* the fluentd addon daemonset will now target all nodes.
* setting `ENABLE_METADATA_CONCEALMENT=true` in kube-up will now set a `cloud.google.com/metadata-proxy-ready=true` label on new nodes. In v1.16, the metadata proxy add-on will switch to using that label as a node selector.
* setting `KUBE_PROXY_DAEMONSET=true` in kube-up will now set a `node.kubernetes.io/kube-proxy-ds-ready=true` label on new nodes. In v1.16, the kube-proxy daemonset add-on will switch to using that label as a node selector.
* In 1.16, the masq-agent daemonset add-on will switch to using `node.kubernetes.io/masq-agent-ds-ready` as a node selector.

/cc @piosz
for fluentd cleanup

/cc @dekkagaijin
for metadata proxy label

/sig cluster-lifecycle
/sig gcp

@k8s-ci-robot
Copy link
Contributor

@liggitt: GitHub didn't allow me to request PR reviews from the following users: dekkagaijin.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Starts to clean up self-set kubelet labels under k8s.io prefixes:

  • removes fluentd node selector to complete migration to daemonset
  • starts the process of switching the beta.kubernetes.io/metadata-proxy-ready label to a cloud.google.com/metadata-proxy-ready label by adding the label to new nodes

Does this PR introduce a user-facing change?:

* the fluentd addon daemonset will now target all nodes.
* setting `ENABLE_METADATA_CONCEALMENT=true` in kube-up will now set a `cloud.google.com/metadata-proxy-ready=true` label on new nodes. In a future release, the metadata add-on will switch to using that label as a node selector.

/cc @piosz
for fluentd cleanup

/cc @dekkagaijin
for metadata proxy label

/sig cluster-lifecycle
/sig gcp

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Feb 22, 2019
@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/gcp cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. approved Indicates a PR has been approved by an approver from all required OWNERS files. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 22, 2019
@liggitt liggitt changed the title Clean up Clean up self-set node labels Feb 22, 2019
@liggitt
Copy link
Member Author

liggitt commented Feb 22, 2019

/cc @MrHohn
for kube-proxy daemonset labeling

@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. labels Feb 22, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@liggitt liggitt force-pushed the drop-k8s-io-node-labels branch 2 times, most recently from 7528540 to 8e99042 Compare February 22, 2019 21:49
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

LGTM for kube-proxy and ip-masq-agent

cluster/gce/gci/configure-helper.sh Show resolved Hide resolved
@liggitt
Copy link
Member Author

liggitt commented Feb 23, 2019

/retest

@liggitt liggitt added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Feb 23, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Feb 23, 2019
@liggitt liggitt added this to the v1.14 milestone Feb 23, 2019
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 24, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 26, 2019
@soggiest
Copy link

soggiest commented Mar 5, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 5, 2019
@liggitt
Copy link
Member Author

liggitt commented Mar 5, 2019

/hold

would like @dekkagaijin to weigh in on the metadata proxy change

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2019
@soggiest
Copy link

soggiest commented Mar 5, 2019

@dekkagaijin please review per @liggitt's comment above. Code freeze for 1.14 is in 3 days, this will need to be merged within the week.

@liggitt
Copy link
Member Author

liggitt commented Mar 5, 2019

also want @thockin's thoughts on the cloud.google.com/metadata-proxy-ready label. That was intended to match things like cloud.google.com/gke-accelerator, but I'm not sure if that matches current thinking

/assign @thockin

@thockin
Copy link
Member

thockin commented Mar 5, 2019

I have precious little knowledge of the metadata proxy stuff. All of these make me want to hurt myself. Thanks for cleaning up. Do we have a plan as to when we can actually get rid of them? I know proxy daemonset work stalled..

@thockin
Copy link
Member

thockin commented Mar 5, 2019

@mikedanese for metdata viz, too

@dekkagaijin
Copy link
Contributor

/lgtm

@k8s-ci-robot
Copy link
Contributor

@dekkagaijin: changing LGTM is restricted to assignees, and only kubernetes/kubernetes repo collaborators may be assigned issues.

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@thockin
Copy link
Member

thockin commented Mar 5, 2019 via email

@liggitt
Copy link
Member Author

liggitt commented Mar 6, 2019

/hold cancel

Do we have a plan as to when we can actually get rid of them? I know proxy daemonset work stalled..

we will need to keep selectors long term for the things that legitimately may not want to run on every node (masq-agent and metadata-proxy)

I don't know if there were blockers to kube-proxy progressing to run as a DS or if that work just got preempted

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2019
@k8s-ci-robot k8s-ci-robot merged commit 45e5f60 into kubernetes:master Mar 6, 2019
@liggitt liggitt deleted the drop-k8s-io-node-labels branch March 13, 2019 04:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants