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 and Canal to v3.12.0 #8618

Merged
merged 3 commits into from
Feb 27, 2020
Merged

Update Calico and Canal to v3.12.0 #8618

merged 3 commits into from
Feb 27, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Feb 24, 2020 •
edited
Loading

Calico 3.12 add support for autodetecting the iptables backend, quite useful for the people using Debian Buster, very soon the default base image in Kops.
https://docs.projectcalico.org/v3.12/release-notes/

This PR moves Calico and Canal to 3.12.0 and bumps the patch version for some of the previous releases.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 24, 2020
@hakman
Copy link
Member Author

hakman commented Feb 24, 2020

/assign @KashifSaadat

@hakman
Copy link
Member Author

hakman commented Feb 24, 2020

/retest

@hakman
Copy link
Member Author

hakman commented Feb 25, 2020

@KashifSaadat any chance you could take a look at this? I would like to cherry-pick it in 1.16 before the release.

@hakman hakman force-pushed the calico-3.12.0 branch 2 times, most recently from f6431a9 to 9d164b2 Compare February 27, 2020 02:27
KashifSaadat
KashifSaadat suggested changes Feb 27, 2020
View reviewed changes
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.

Sorry for the delay in getting around to this! Can you also bring the typha deployment in-line with the v3.12.0 spec. Env vars, health probes, privileged securityContext etc.

@hakman
Copy link
Member Author

hakman commented Feb 27, 2020

No worries @KashifSaadat. I don't think there were any changes in the typha section.
Maybe I am missing something. If so, can you point me in the right direction?

KashifSaadat
KashifSaadat reviewed Feb 27, 2020
View reviewed changes
pkg/apis/kops/validation/validation.go Outdated
allErrs = append(allErrs, field.NotSupported(fldPath.Child("chainInsertMode"), chainInsertMode, []string{"insert", "append"}))
if v.ChainInsertMode != "" {
valid := []string{"insert", "append"}
allErrs = append(allErrs, IsValidValue(fldPath, &v.ChainInsertMode, valid)...)
Copy link
Contributor

Choose a reason for hiding this comment

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

Changing from fldPath.Child("chainInsertMode") to fldPath results in the validation message being less specific, i.e.:

# error populating cluster spec: spec.networking.canal: Unsupported value: "bad": supported values: "insert", "append"

Can you correct this for all cases here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for noticing this. I think it should be better now.

@KashifSaadat
Copy link
Contributor

No worries @KashifSaadat. I don't think there were any changes in the typha section.
Maybe I am missing something. If so, can you point me in the right direction?

I misread my bad, it looks fine! 👍

KashifSaadat
KashifSaadat approved these changes Feb 27, 2020
View reviewed changes
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.

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 Feb 27, 2020
@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 Feb 27, 2020
@k8s-ci-robot k8s-ci-robot merged commit a594184 into kubernetes:master Feb 27, 2020
@hakman
Copy link
Member Author

hakman commented Feb 27, 2020

Thanks for taking the time for this @KashifSaadat :)

@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Feb 27, 2020
This was referenced Feb 27, 2020
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Feb 28, 2020
@k8s-ci-robot
Merge pull request #8645 from hakman/calico-3.12.0-1.17
684b7f8 
Cherry pick of #8618: Update Calico and Canal to v3.12.0
@hakman hakman deleted the calico-3.12.0 branch March 1, 2020 05:09
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

@KashifSaadat KashifSaadat KashifSaadat approved these changes

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@KashifSaadat KashifSaadat

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

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