-
Notifications
You must be signed in to change notification settings - Fork 45
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
Conversation
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.
Hello nicolast,My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of 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 |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
/approve |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
The following options are set: approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye nicolast. |
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 thekubernetes-cni
package we deploy, this is not enabled in 'our'configuration.
Once
kubernetes-cni
would include this binary (or, given where thingsare going,
kubelet
includes it), we could enable it.Another approach would be for our
calico-cni-plugin
to include therequired 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 betweenpackages installing the same files.