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

calico: update to Calico 3.12.0 #2253

Merged
merged 1 commit into from
Feb 25, 2020
Merged

Conversation

NicolasT
Copy link
Contributor

Deployment manifest updated based on upstream from
https://docs.projectcalico.org/v3.12/manifests/calico.yaml.

Note: Calico by default now deploys a CNI configuration which includes
the bandwidth plugin. Since this plugin executable is not part of the
kubernetes-cni package we deploy, this is not enabled in 'our'
configuration.

Once kubernetes-cni would include this binary (or, given where things
are going, kubelet includes it), we could enable it.

Another approach would be for our calico-cni-plugin to include the
required CNI plugins (as is done by the upstream install mechanism,
copying binaries out of a container), and no longer install
kubernetes-cni. However, this would introduce conflicts between
packages installing the same files.

Deployment manifest updated based on upstream from
https://docs.projectcalico.org/v3.12/manifests/calico.yaml.

Note: Calico by default now deploys a CNI configuration which includes
the `bandwidth` plugin. Since this plugin executable is not part of the
`kubernetes-cni` package we deploy, this is not enabled in 'our'
configuration.

Once `kubernetes-cni` would include this binary (or, given where things
are going, `kubelet` includes it), we could enable it.

Another approach would be for our `calico-cni-plugin` to include the
required CNI plugins (as is done by the upstream install mechanism,
copying binaries out of a container), and no longer install
`kubernetes-cni`. However, this would introduce conflicts between
packages installing the same files.
@NicolasT NicolasT added topic:networking Networking-related issues topic:deployment Bugs in or enhancements to deployment stages complexity:easy Something that requires less than a day to fix kind:dependencies Pull requests that update a dependency file release:nice to have An issue planned for a release which may be moved out if required labels Feb 20, 2020
@NicolasT NicolasT requested a review from a team February 20, 2020 16:12
@bert-e
Copy link
Contributor

bert-e commented Feb 20, 2020

Hello nicolast,

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 Feb 20, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.6/improvement/update-calico with contents from improvement/update-calico
and development/2.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.6/improvement/update-calico origin/development/2.6
 $ git merge origin/improvement/update-calico
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.6/improvement/update-calico

@bert-e
Copy link
Contributor

bert-e commented Feb 20, 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:

@NicolasT
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 20, 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:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 25, 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.5

  • ✔️ development/2.6

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

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 Feb 25, 2020

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

  • ✔️ development/2.5

  • ✔️ development/2.6

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

Please check the status of the associated issue None.

Goodbye nicolast.

@bert-e bert-e merged commit 42cd8e3 into development/2.5 Feb 25, 2020
@bert-e bert-e deleted the improvement/update-calico branch February 25, 2020 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:dependencies Pull requests that update a dependency file release:nice to have An issue planned for a release which may be moved out if required topic:deployment Bugs in or enhancements to deployment stages topic:networking Networking-related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants