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

Remove manually added labels from addons #10987

Merged
merged 1 commit into from
Mar 6, 2021

Conversation

hakman
Copy link
Member

@hakman hakman commented Mar 6, 2021

This removes role.kubernetes.io/networking: "1" and role.kubernetes.io/authentication: "1" labels which are now added automatically since #10796.

/cc @olemarkus

@k8s-ci-robot k8s-ci-robot requested a review from olemarkus March 6, 2021 07:34
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/addons labels Mar 6, 2021
@hakman hakman added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Mar 6, 2021
Copy link
Member

@olemarkus olemarkus left a comment

Choose a reason for hiding this comment

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

Thanks for taking the time to do this one.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 6, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 6, 2021
@hakman
Copy link
Member Author

hakman commented Mar 6, 2021

Was a pleasure. Now I don't have to see them every time I update Calico.
😁

@k8s-ci-robot k8s-ci-robot merged commit 1cd5d47 into kubernetes:master Mar 6, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 6, 2021
@hakman hakman deleted the addons-labels-cleanup branch March 6, 2021 08:23
namespace: kube-system
spec:
# Wait 5 seconds to let pod connect before rolling next pod
selector:
matchLabels:
name: weave-net
role.kubernetes.io/networking: "1"

Choose a reason for hiding this comment

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

@hakman this breaks the weave addon update as selector labels are immutable, logs from protokube

The DaemonSet "weave-net" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"name":"weave-net"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable

error updating "networking.weave": error applying update from "s3://kops...": error running kubectl: exit status 1

Copy link
Member

Choose a reason for hiding this comment

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

Support for weave has been removed now due to the inactivity of upstream. So I while we did an unintentional breaking change here, I think the path forward is to migrate to another CNI.

Choose a reason for hiding this comment

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

Thanks for the reply, migration from weave is planned but this added an extra twist.

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/addons 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants