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

Automated cherry pick of #8589: Bump Cilium to 1.7 for k8s 1.12+ #8620

Closed
wants to merge 2 commits into from
Closed

Automated cherry pick of #8589: Bump Cilium to 1.7 for k8s 1.12+ #8620

wants to merge 2 commits into from

Conversation

olemarkus
Copy link
Member

Cherry pick of #8589 on release-1.17.

#8589: Bump Cilium to 1.7 for k8s 1.12+

For details on the cherry pick process, see the cherry pick requests page.

Bump Cilium to 1.7 for k8s 1.12+
7dc4952 
Cilium 1.7 requires K8s 1.12 minimum. Changed the templates so that we
can have different cilium versions for different k8s versions.

This also mean that this addon will behave similar to other addons wrt
upgrades. Cilium used to add a fixed version to the cluster spec on cluster creation so
upgrades were slightly more manual. Now, for new clusters, upgrades will
happen implicitly with kops updates unless the .Version is added
manually to the cluster spec.
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Feb 24, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 24, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @olemarkus. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: olemarkus
To complete the pull request process, please assign chrislovecnm
You can assign the PR to them by writing /assign @chrislovecnm in a comment when ready.

The full list of commands accepted by this bot can be found 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

@hakman
Copy link
Member

hakman commented Feb 24, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 24, 2020
@olemarkus
Copy link
Member Author

/retest

3 similar comments
@hakman
Copy link
Member

hakman commented Feb 25, 2020

/retest

@hakman
Copy link
Member

hakman commented Feb 25, 2020

/retest

@johngmyers
Copy link
Member

/retest

hakman
hakman reviewed Feb 25, 2020
View reviewed changes
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template Outdated
@@ -368,7 +387,7 @@ spec:
value: {{ . }}
{{ end }}
{{ with .Networking.Cilium }}
image: "docker.io/cilium/cilium:{{ .Version }}"
image: "docker.io/cilium/cilium:{{- or .Version "v.1.7.0" }}"
Copy link
Member

Choose a reason for hiding this comment

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

@olemarkus this is missing the typo fix from #8591

Suggested change
image: "docker.io/cilium/cilium:{{- or .Version "v.1.7.0" }}"
image: "docker.io/cilium/cilium:{{- or .Version "v1.7.0" }}"

Copy link
Member Author

Choose a reason for hiding this comment

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

I was thinking both PRs had to be cherry-picked. But that is perhaps a silly. Will fix

Copy link
Member

Choose a reason for hiding this comment

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

I agree that both have to be cherrypicked. Just did not see the other one.
Btw, the automated cherry-pick script can do N PRs at same time. Maybe you want to close and create one with both fixes.

Copy link
Member Author

Choose a reason for hiding this comment

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

ah. I didn't know that. That sounds better.

@olemarkus olemarkus closed this Feb 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman hakman left review comments

@justinsb justinsb Awaiting requested review from justinsb

@mikesplain mikesplain Awaiting requested review from mikesplain

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.17
Development

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