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

Support new NODE_OS_DISTRIBUTION 'custom' on GCE #61235

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Support new NODE_OS_DISTRIBUTION 'custom' on GCE #61235

merged 1 commit into from
Mar 21, 2018

Conversation

yguo0905
Copy link
Contributor

@yguo0905 yguo0905 commented Mar 15, 2018 •
edited
Loading

What this PR does / why we need it:

This PR allows us to run e2e tests against arbitrary OS images on GCE.

It will be cherry picked into 1.8, 1.9 and 1.10.

Release note:

Support new NODE_OS_DISTRIBUTION 'custom' on GCE.

/assign @dashpole

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 15, 2018
dashpole
dashpole reviewed Mar 15, 2018
View reviewed changes
cluster/common.sh
@@ -325,7 +325,7 @@ function find-release-tars() {
# This tarball is used by GCI, Ubuntu Trusty, and Container Linux.
KUBE_MANIFESTS_TAR=
if [[ "${MASTER_OS_DISTRIBUTION:-}" == "trusty" || "${MASTER_OS_DISTRIBUTION:-}" == "gci" || "${MASTER_OS_DISTRIBUTION:-}" == "ubuntu" ]] || \
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need to allow this for master os distribution as well, or do those tests still use GCI for the master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All tests use cos as master image. BTW, we should probably also remove ubuntu from master os some time later.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, great.

@yguo0905
Copy link
Contributor Author

I might need to change this from CUSTOM to custom.

@dashpole
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2018
@yguo0905 yguo0905 changed the title Support new NODE_OS_DISTRIBUTION 'CUSTOM' on GCE Support new NODE_OS_DISTRIBUTION 'custom' on GCE Mar 15, 2018
@yguo0905 yguo0905 mentioned this pull request Mar 15, 2018
Merged
@yguo0905
Copy link
Contributor Author

@zmerlynn, please take a look. Thanks!

@yguo0905 yguo0905 mentioned this pull request Mar 17, 2018
Merged
@yguo0905
Copy link
Contributor Author

The new GKE tests (example) are failing because

W0319 13:42:13.835] 2018/03/19 13:42:13 process.go:150: Running: bash -c 
W0319 13:42:13.835] function log_dump_custom_get_instances() {
W0319 13:42:13.836]   if [[ $1 == "master" ]]; then
W0319 13:42:13.836]     return 0
W0319 13:42:13.836]   fi
W0319 13:42:13.836] 
W0319 13:42:13.837]   gcloud compute instances list '--project=gke-up-c1-4-glat-up-mas' '--filter=(metadata.created-by:*zones/us-central1-f/instanceGroupManagers/gke-test-9f571eac2b-default-pool-ab3bb5f7-grp)' '--format=get(name)'
W0319 13:42:13.837] }
W0319 13:42:13.837] export -f log_dump_custom_get_instances
W0319 13:42:13.837] # Set below vars that log-dump.sh expects in order to use scp with gcloud.
W0319 13:42:13.837] export PROJECT=gke-up-c1-4-glat-up-mas
W0319 13:42:13.838] export ZONE='us-central1-f'
W0319 13:42:13.838] export KUBERNETES_PROVIDER=gke
W0319 13:42:13.838] ./cluster/log-dump/log-dump.sh '/workspace/_artifacts'
W0319 13:42:13.838] Cannot operate on cluster using node os distro: custom

So this PR is needed for both GCE and GKE tests.

@yguo0905
Copy link
Contributor Author

/assign @dchen1107

@dchen1107
Copy link
Member

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, dchen1107, yguo0905

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 Mar 19, 2018
@yguo0905
Copy link
Contributor Author

/retest

This was referenced Mar 20, 2018
Merged
Merged
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 61124, 59537, 61235, 61258, 61114). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 130caab into kubernetes:master Mar 21, 2018
k8s-github-robot pushed a commit that referenced this pull request Mar 25, 2018
Merge pull request #61428 from yguo0905/automated-cherry-pick-of-#612…
af39738 
…35-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #61235: Support new NODE_OS_DISTRIBUTION 'custom' on GCE

Cherry pick of #61235 on release-1.9.

#61235: Support new NODE_OS_DISTRIBUTION 'custom' on GCE
@yguo0905 yguo0905 mentioned this pull request Mar 26, 2018
Merged
k8s-github-robot pushed a commit that referenced this pull request Mar 28, 2018
Merge pull request #61429 from yguo0905/automated-cherry-pick-of-#612…
fa8e75c 
…35-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #61235: Support new NODE_OS_DISTRIBUTION 'custom' on GCE

Cherry pick of #61235 on release-1.8.

#61235: Support new NODE_OS_DISTRIBUTION 'custom' on GCE
k8s-github-robot pushed a commit that referenced this pull request Mar 28, 2018
Merge pull request #61731 from yguo0905/automated-cherry-pick-of-#612…
ac5071d 
…35-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #61235: Support new NODE_OS_DISTRIBUTION 'custom' on GCE

Cherry pick of #61235 on release-1.10.

#61235: Support new NODE_OS_DISTRIBUTION 'custom' on GCE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dashpole dashpole dashpole left review comments

@jszczepkowski jszczepkowski Awaiting requested review from jszczepkowski

@zmerlynn zmerlynn Awaiting requested review from zmerlynn

Assignees

@dashpole dashpole

@dchen1107 dchen1107

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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yguo0905 @dashpole @dchen1107 @k8s-ci-robot @k8s-github-robot