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

Fix Calico upgrade job to use the correct version #6156

Merged
merged 1 commit into from
Dec 4, 2018

Conversation

tmjd
Copy link
Contributor

@tmjd tmjd commented Dec 4, 2018

No description provided.

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 4, 2018
@k8s-ci-robot
Copy link
Contributor

Hi @tmjd. 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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 4, 2018
Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

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

Can you also bump the version here:

"k8s-1.7-v3": "3.3.1-kops.2",
}

In this case since it looks like it was already bumped, just change it from 3.3.1-kops.2 to 3.3.1-kops.3to have kops pick it up as a change

@@ -578,7 +578,7 @@ subjects:
apiVersion: batch/v1
kind: Job
metadata:
name: calico-complete-upgrade
name: calico-complete-upgrade-v331
Copy link
Contributor

Choose a reason for hiding this comment

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

Ahh yes, since jobs can't be updated as themselves 👍

@mikesplain
Copy link
Contributor

/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 Dec 4, 2018
@mikesplain
Copy link
Contributor

@tmjd seems like we should likely cherry-pick this into 1.11 as well, thoughts?

Copy link
Member

@caseydavenport caseydavenport left a comment

Choose a reason for hiding this comment

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

@tmjd thanks for cleaning up my mess. this LGTM!

@tmjd
Copy link
Contributor Author

tmjd commented Dec 4, 2018

@mikesplain Yes this should be cherry-picked to 1.11.

@tmjd tmjd force-pushed the fix-calico-upgrade-version branch from 280a073 to d2e9fcb Compare December 4, 2018 19:42
@mikesplain
Copy link
Contributor

Thanks @tmjd!
/lgtm
/approve
/cherry-pick

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 4, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikesplain, tmjd

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 Dec 4, 2018
k8s-ci-robot added a commit that referenced this pull request Dec 4, 2018
…56-origin-release-1.11

Automated cherry pick of #6156: Fix Calico upgrade job to use the correct version
@k8s-ci-robot k8s-ci-robot merged commit 6af9813 into kubernetes:master Dec 4, 2018
@tmjd tmjd deleted the fix-calico-upgrade-version branch February 1, 2019 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants