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

Add Git <-> Kubernetes mapping for 1.10 #6919

Closed
wants to merge 1 commit into from
Closed

Add Git <-> Kubernetes mapping for 1.10 #6919

wants to merge 1 commit into from

Conversation

calebamiles
Copy link
Contributor

We're still using Golang 1.9

/area so-crazy-it-just-might-work
/area prow

@k8s-ci-robot k8s-ci-robot added area/so-crazy-it-just-might-work area/prow Issues or PRs related to prow size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 21, 2018
@calebamiles calebamiles mentioned this pull request Feb 21, 2018
Merged
@krzyzacy
Copy link
Member

this will need a new Dockerfile in https://github.com/kubernetes/test-infra/tree/master/images/kubekins-test

and probably should be part of #6834
cc @cjwagner

ixdy
ixdy reviewed Feb 21, 2018
View reviewed changes
Copy link
Member

@ixdy ixdy left a comment

Choose a reason for hiding this comment

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

ok, figured it out. this isn't well documented, but:

  • BRANCH_VERSION converts a git branch name to the kubernetes version to use. 1.2 and 1.3 probably aren't needed anymore, but at the time we created this, we wanted to use the k8s 1.4 test image for those branches as well.

  • VERSION_TAG below defines which image to use for tests. we probably need a line there for 1.10 - though I'm not sure if we've built an appropriate test image yet for 1.10.

scenarios/kubernetes_verify.py Outdated
@@ -29,6 +29,7 @@
BRANCH_VERSION = {
'1.2': '1.4',
'1.3': '1.4',
'1.10': '1.9',
'master': '1.9',
Copy link
Member

Choose a reason for hiding this comment

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

change this from 1.9 to 1.10

scenarios/kubernetes_verify.py Outdated
@@ -29,6 +29,7 @@
BRANCH_VERSION = {
'1.2': '1.4',
'1.3': '1.4',
'1.10': '1.9',
Copy link
Member

Choose a reason for hiding this comment

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

we don't need this

@krzyzacy
Copy link
Member

/assign

@ixdy
Copy link
Member

ixdy commented Feb 21, 2018

@cjwagner @BenTheElder looks like we need a kubekins-test image for 1.10 still.

@BenTheElder
Copy link
Member

@cjwagner @BenTheElder looks like we need a kubekins-test image for 1.10 still.

On it.

@calebamiles calebamiles changed the title Add Golang Docker image pointers for 1.10 release Add Git <-> Kubernetes mapping for 1.10 Feb 21, 2018
@calebamiles
Copy link
Contributor Author

let me know when you're done @BenTheElder and I'll update this PR. Updated the PR with comments, @ixdy

@BenTheElder
Copy link
Member

PR with images pending here: #6920

@calebamiles
Add mapping between branch and Kubernetes version for 1.10
a62461d 
...also annotates maps with minimal comments
@calebamiles
Copy link
Contributor Author

Updated PTAL, @BenTheElder. Thanks!

BenTheElder
BenTheElder approved these changes Feb 21, 2018
View reviewed changes
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold
I think this is fine, but I'm not totally certain about the master -> 1.10 mapping @krzyzacy can you confirm?

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Feb 21, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, calebamiles

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 21, 2018
@krzyzacy
Copy link
Member

seems this is a subset of #6921

@calebamiles
Copy link
Contributor Author

Agreed, @krzyzacy. Closing in favor of #6921.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ixdy ixdy ixdy left review comments

@BenTheElder BenTheElder BenTheElder approved these changes

@krzyzacy krzyzacy Awaiting requested review from krzyzacy

Assignees

@BenTheElder BenTheElder

@krzyzacy krzyzacy

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/prow Issues or PRs related to prow area/so-crazy-it-just-might-work cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@calebamiles @krzyzacy @ixdy @BenTheElder @k8s-ci-robot