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

Upgrade Calico to 3.16.1 #2824

Merged
merged 3 commits into from
Oct 2, 2020
Merged

Upgrade Calico to 3.16.1 #2824

merged 3 commits into from
Oct 2, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'salt', 'build'

Context:

Calico upgrade

Summary:

  • Upgrade calico to 3.16.1
  • Use new cidr method from calico 3.16.0, to autodetect the calico node IP
  • Tie calico-kube-controllers pod to master node

Fixes: #2243

@TeddyAndrieux TeddyAndrieux added kind:enhancement New feature or request topic:deployment Bugs in or enhancements to deployment stages topic:lifecycle Issues related to upgrade or downgrade of MetalK8s complexity:medium Something that requires one or few days to fix priority:medium Medium priority issues, should only be postponed if no other option topic:salt Everything related to SaltStack in our product labels Oct 1, 2020
@TeddyAndrieux TeddyAndrieux requested a review from a team October 1, 2020 12:30
@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
calico: Update to Calico 3.16.1
445d343 
Deployment manifest updated based on upstream from
https://docs.projectcalico.org/v3.16/manifests/calico.yaml.
@TeddyAndrieux
salt: Use cidr as detection method for calico IP
d4c6457 
Since calico 3.16 we can provide cidr(s) to autodetect the IP to use for
calico node, so let's use this
@TeddyAndrieux
salt: Tie calico-kube-controllers to master nodes
7d3713c 
Tie `calico-kube-controllers` pod to master nodes only.
Since it's mandatory to have this pod to have a working cluster
let's tie this one to master and not to infra.

Fixes: #2243
@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

History mismatch

Merge commit #ce1430be022634e539188673ca659abe284254a4 on the integration branch
w/2.7/improvement/upgrade-calico is merging a branch which is neither the current
branch improvement/upgrade-calico nor the development branch
development/2.7.

It is likely due to a rebase of the branch improvement/upgrade-calico and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

alexandre-allard
alexandre-allard approved these changes Oct 1, 2020
View reviewed changes
Copy link
Contributor

@alexandre-allard alexandre-allard left a comment

Choose a reason for hiding this comment

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

I didn't check the whole deployed.sls, but it looks good to me and CI seems happy.

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 2, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.6

  • ✔️ development/2.7

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 2, 2020

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.6

  • ✔️ development/2.7

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 84a88bc into development/2.6 Oct 2, 2020
@bert-e bert-e deleted the improvement/upgrade-calico branch October 2, 2020 09:36
NicolasT
NicolasT reviewed Oct 2, 2020
View reviewed changes
salt/metalk8s/kubernetes/cni/calico/deployed.sls
# all workload CIDR
value: can-reach={{ networks.workload_plane.cidr[0].split('/')[0] }}
# NOTE: Use all workload CIDRs
value: cidr={{ networks.workload_plane.cidr | join(',') }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, sweet, is this a new feature @TeddyAndrieux ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yeppp new in 3.16.0 pretty cool especially in our case

@TeddyAndrieux TeddyAndrieux mentioned this pull request Oct 6, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NicolasT NicolasT NicolasT left review comments

@alexandre-allard alexandre-allard alexandre-allard approved these changes

Assignees
No one assigned
Labels
complexity:medium Something that requires one or few days to fix kind:enhancement New feature or request priority:medium Medium priority issues, should only be postponed if no other option topic:deployment Bugs in or enhancements to deployment stages topic:lifecycle Issues related to upgrade or downgrade of MetalK8s topic:salt Everything related to SaltStack in our product
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

calico-kube-controllers Pods not tied to infra (or even master?) nodes
4 participants
@TeddyAndrieux @bert-e @NicolasT @alexandre-allard