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

Update Calico to v3.10.2 #8104

Merged
merged 6 commits into from
Dec 18, 2019
Merged

Conversation

hakman
Copy link
Member

@hakman hakman commented Dec 13, 2019

Calico v3.10 is here with some nice new stuff like bird/bird6 liveness checks.
Canal is already at 3.10 but Calico should be upgraded too.

This PR addresses also some other issues:

  • make Calico and Canal templates easier to compare, by moving around some fields
  • make Canal easier to compare to official manifest
  • add role.kubernetes.io/networking labels to Canal

Commits should be reviewed one by one, as it will be much easier to compare each step.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 13, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @hakman. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 13, 2019
@hakman
Copy link
Member Author

hakman commented Dec 13, 2019

/assign @KashifSaadat

@rifelpet
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 13, 2019
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: calico
name: calico-node
Copy link
Contributor

Choose a reason for hiding this comment

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

Due to the change in role name upstream, this becomes a breaking change for users upgrading as role references in bindings cannot be changed.

Copy link
Member Author

Choose a reason for hiding this comment

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

ACK. Will change back this part.

kind: ServiceAccount
metadata:
name: canal
namespace: kube-system
Copy link
Contributor

Choose a reason for hiding this comment

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

So this one has puzzled me. I would have expected that the ServiceAccount must exist before the deployment that references it is created, but I guess as all resources are applied in quick succession the SA will be created before the scheduler kicks in to create the DS pods.

Copy link
Member Author

Choose a reason for hiding this comment

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

I did not see any issue with this. I agree that this is the recommended way to do it, but it would be different from the official manifest and make it harder to compare with official manifests.
I would first try to push the change in official manifests.

{{- if .Networking.Canal.MTU }}
veth_mtu: "{{ .Networking.Canal.MTU }}"
{{- else }}
veth_mtu: "{{- if eq .CloudProvider "openstack" -}}1430{{- else -}}1440{{- end -}}"
Copy link
Contributor

@KashifSaadat KashifSaadat Dec 14, 2019

Choose a reason for hiding this comment

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

If unset it previously defaulted to 1500, should that be 1440 now in all cases?

Copy link
Member Author

@hakman hakman Dec 14, 2019

Choose a reason for hiding this comment

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

I used the same logic from the Calico side. The value seemed a safer default for most environments, including when IP-in-IP is used (for cross subnet):
https://docs.projectcalico.org/v3.10/networking/mtu#determine-mtu-size

Copy link
Contributor

@KashifSaadat KashifSaadat left a comment

Choose a reason for hiding this comment

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

Good work, thanks @hakman !

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, KashifSaadat

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 Dec 18, 2019
@hakman
Copy link
Member Author

hakman commented Dec 18, 2019

Thanks @KashifSaadat, will prepare the cherry-pick for 1.17 once it's merged.

@k8s-ci-robot k8s-ci-robot merged commit 1d40aab into kubernetes:master Dec 18, 2019
k8s-ci-robot added a commit that referenced this pull request Dec 18, 2019
…pstream-release-1.17

Automated cherry pick of #8104: Add Calico v3.10.2
spec:
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/role: master
Copy link
Contributor

@seh seh Jul 21, 2020

Choose a reason for hiding this comment

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

This makes it much harder to run more than three Typha replicas. It would be better to have node affinity that expresses a preference, but not a requirement for Typha pods to run on the masters.

Please see #9608 for a follow-on suggestion.

@tmjd
Copy link
Contributor

tmjd commented Aug 20, 2020

Why was a nodeselector of kubernetes.io/role: master added to Calico, it has not been present in prior Kops Calico versions? I don't believe it has ever been present in the Calico docs. Was it just copied from the Canal manifest?
Does anyone know why Canal had it either?

@hakman
Copy link
Member Author

hakman commented Aug 20, 2020

@tmjd the change was first added in this commit: appvia@9b7a798

@KashifSaadat do you remember about this? ^^^

@tmjd
Copy link
Contributor

tmjd commented Aug 20, 2020

Ok so it was just copied from the Canal manifest, no specific reason then.
Thanks

@KashifSaadat
Copy link
Contributor

Hey @hakman, just commented here: #7917 (comment)

@hakman
Copy link
Member Author

hakman commented Aug 20, 2020

Thanks @KashifSaadat :)

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants