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

Update Calico to v3.15.0 for k8s 1.16+ #9444

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Update Calico to v3.15.0 for k8s 1.16+ #9444

merged 1 commit into from
Jun 30, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 25, 2020

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 25, 2020
@hakman hakman force-pushed the calico-3.15.0 branch 4 times, most recently from 9168048 to 6b92cde Compare June 30, 2020 04:53
@hakman hakman changed the title [WIP] Update Calico to v3.15.0 for k8s 1.16+ Update Calico to v3.15.0 for k8s 1.16+ Jun 30, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 30, 2020
@hakman
Copy link
Member Author

hakman commented Jun 30, 2020

/retest

johngmyers
johngmyers reviewed Jun 30, 2020
View reviewed changes
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
@@ -61,232 +65,3131 @@ data:
---
# Source: calico/templates/kdd-crds.yaml

apiVersion: apiextensions.k8s.io/v1beta1

---
Copy link
Member

Choose a reason for hiding this comment

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

Empty resources have caused us problems in the past. Are we stripping all these out now?

Copy link
Member Author

Choose a reason for hiding this comment

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

We are stripping them now. I thought is best to keep them as close as possible to the official manifest, even if not as clean.

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
Copy link
Member

Choose a reason for hiding this comment

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

Seems suspicious to have a version of "(devel)"

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, seems to be a small mess in the official templates.

Copy link
Member Author

Choose a reason for hiding this comment

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

Calico is moving to install via operator but still provides the manifests. Probably this is why the mess. At some point we should look into that and see if we can convert our templates also.

@hakman hakman changed the title Update Calico to v3.15.0 for k8s 1.16+ [WIP] Update Calico to v3.15.0 for k8s 1.16+ Jun 30, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 30, 2020
@hakman hakman changed the title [WIP] Update Calico to v3.15.0 for k8s 1.16+ Update Calico to v3.15.0 for k8s 1.16+ Jun 30, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 30, 2020
@rdrgmnzs
Copy link
Contributor

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 Jun 30, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jun 30, 2020
@k8s-ci-robot k8s-ci-robot merged commit 113fab8 into kubernetes:master Jun 30, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jun 30, 2020
@hakman hakman deleted the calico-3.15.0 branch July 1, 2020 03:12
@hakman hakman mentioned this pull request Jul 2, 2020
Merged
k8s-ci-robot added a commit that referenced this pull request Jul 3, 2020
@k8s-ci-robot
Merge pull request #9482 from hakman/automated-cherry-pick-of-#9444-u…
d758f99 
…pstream-release-1.18

Automated cherry pick of #9444: Update Calico to v3.15.0 for k8s 1.16+
@hakman hakman restored the calico-3.15.0 branch July 6, 2020 15:48
@hakman hakman deleted the calico-3.15.0 branch July 6, 2020 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johngmyers johngmyers johngmyers left review comments

@gjtempleton gjtempleton Awaiting requested review from gjtempleton

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

Assignees

@rdrgmnzs rdrgmnzs

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.
4 participants
@hakman @rdrgmnzs @k8s-ci-robot @johngmyers