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 #49125 #49349

Merged
merged 1 commit into from
Jul 28, 2017
Merged

Automated cherry pick of #49125 #49349

merged 1 commit into from
Jul 28, 2017

Conversation

abgworrall
Copy link
Contributor

@abgworrall abgworrall commented Jul 21, 2017 •
edited

When testing, GKE created clusters don't provide a MasterName, so carry on anyway and log node OS images without it

Background: this is code that runs during gce/gke testing, and records which specific OS images were being run on the master and node. When we test new OS images for GKE, we need to test them on all supported branches (i.e. >=1.5), so this piece of work needs to be backported to all branches. This specific cherrypick adds a guard for GKE-created clusters, which omit the MasterName, letting it proceed and log the node OS.

Cherry pick of #49125 on release-1.7.

#49125: Tolerate a missing MasterName (for GKE)

NONE

@abgworrall
Tolerate a missing MasterName (for GKE)
784d313 
GKE created clusters don't provide a MasterName, so don't
throw a warning and give up when that happens.
@k8s-ci-robot
Copy link
Contributor

Hi @abgworrall. 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.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 21, 2017
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 21, 2017
@k8s-github-robot
Copy link

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@k8s-github-robot k8s-github-robot added release-note-label-needed release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Jul 21, 2017
@0xmichalis 0xmichalis removed their assignment Jul 21, 2017
@zmerlynn
Copy link
Member

/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 Jul 24, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abgworrall, zmerlynn

Associated issue: 49125

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2017
@zmerlynn
Copy link
Member

/test pull-kubernetes-kubemark-e2e-gce

1 similar comment
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-kubemark-e2e-gce

@k8s-ci-robot
Copy link
Contributor

@abgworrall: you can't request testing unless you are a kubernetes member.

In response to this:

/test pull-kubernetes-kubemark-e2e-gce

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.

@tallclair
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 25, 2017
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-kubemark-e2e-gce

1 similar comment
@abgworrall
Copy link
Contributor Author

/test pull-kubernetes-kubemark-e2e-gce

@abgworrall
Copy link
Contributor Author

/assign @wojtek-t
Hi, Wojtek ! Is this good to merge ?

@abgworrall abgworrall mentioned this pull request Jul 26, 2017
Merged
@wojtek-t wojtek-t added this to the v1.7 milestone Jul 27, 2017
@wojtek-t wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 27, 2017
@wojtek-t wojtek-t removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jul 27, 2017
@abgworrall
Copy link
Contributor Author

@zmerlynn , can you merge this ? Thanks in advance :)

@wojtek-t
Copy link
Member

/test pull-kubernetes-e2e-gce-etcd3

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 19c606d into kubernetes:release-1.7 Jul 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@madhusudancs madhusudancs

@zmerlynn zmerlynn

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@abgworrall @k8s-ci-robot @k8s-github-robot @zmerlynn @tallclair @wojtek-t @madhusudancs @0xmichalis