Make logdump support kubemark and support gke with 'use_custom_instance_list' #51834
Conversation
shyamjvs
added
the
release-note-none
k8s-ci-robot
added
size/M
ericchiang
added
priority/critical-urgent
|
cc @kubernetes/release-maintainers bumped the queue priority because this is enables our ability to fix other upgrade tests. |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/assign @eparis @mikedanese |
|
/test pull-kubernetes-unit |
|
/retest |
|
/approve |
|
/retest |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: krzyzacy, mikedanese, shyamjvs Associated issue: 4321 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 |
k8s-github-robot
added
the
approved
|
/retest |
|
@ericchiang We don't need kops-aws to pass... It's not a required presubmit |
|
Automatic merge from submit-queue |
|
@shyamjvs: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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. |
|
/sig cluster-lifecycle /test pull-kubernetes-unit |
k8s-ci-robot
added
the
sig/cluster-lifecycle
|
@wojtek-t Could you mark this as a cherrypick-candidate for 1.7? This is needed for getting logs in our GKE tests. I'm happy to create the cherrypick PR if need be. |
|
Hi, @wojtek-t ! This is breaking OS image testing on GKE / 1.7, so I'm super keen to see a fix get cherrypicked ... |
eparis
added
the
release-note
|
I added |
wojtek-t
added
cherry-pick-approved
|
Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked. |
|
This did indeed fixup GKE testing for the 1.7 branch. Wahoo ! Now we'll need a cherrypick into the 1.6 branch ... and maybe the 1.5 branch too, which is still supported. |
|
SGTM for 1.6. @shyamjvs would you mind running the cherrypick script against release-1.6? |
| @@ -68,6 +64,8 @@ function setup() { | |||
| source "${KUBE_ROOT}/cluster/kube-util.sh" | |||
| echo "Detecting project" | |||
| detect-project 2>&1 | |||
| elif [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then | |||
| echo "Using 'use_custom_instance_list' with gke, skipping check for LOG_DUMP_SSH_KEY and LOG_DUMP_SSH_USER" | |||
There was a problem hiding this comment.
Er, no. This is wrong. If there's no LOG_DUMP_SSH_KEY, use_custom_instance_list can't work. Can we undo this PR instead?
There was a problem hiding this comment.
Please see below. We don't need the the ssh key in case of gke (even if we're using use_custom_instances_list).
There was a problem hiding this comment.
I'm not going to argue this anymore, but we really shouldn't be using the gcloud assumptions.
| if [[ -n "${use_custom_instance_list}" ]]; then | ||
| if [[ "${gcloud_supported_providers}" =~ "${KUBERNETES_PROVIDER}" ]]; then | ||
| # get-serial-port-output lets you ask for ports 1-4, but currently (11/21/2016) only port 1 contains useful information | ||
| gcloud compute instances get-serial-port-output --project "${PROJECT}" --zone "${ZONE}" --port 1 "${node}" > "${dir}/serial-1.log" || true |
There was a problem hiding this comment.
I wish this wasn't also part of the PR. One issue at at a time, please. :)
There was a problem hiding this comment.
This is part of the same issue. The point was to use 'gcloud ssh' for all gcloud supported providers (even though there's a custom_instance_list).
And this is the right behaviour - we shouldn't use gcloud just because we're using custom instance list (as the provider might be some non-gcloud one like aws).
Fixes kubernetes/test-infra#4321 (for kubemark)
Fixes kubernetes/test-infra#4323 (for gke)
/cc @ericchiang @fejta @krzyzacy