A couple cherry-picks from master

[hklai]

No description provided.

[googlebot]

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

[hklai]

/test e2e-simpleTests
/test istio-unit-tests

[hklai]

/test e2e-simpleTests

[douglas-reid]

/lgtm

[istio-testing]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: douglas-reid, hklai

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:

• install/OWNERS [hklai]
• mixer/OWNERS [douglas-reid,hklai]
• security/OWNERS [hklai]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[hklai]

/test e2e-simpleTests

[hklai]

@douglas-reid simpleTest failed consistently few times in a row (not the same reasons however). Do you see how this PR might have broken it?

[hklai]

/test e2e-simpleTests

[douglas-reid]

@hklai i'll take a look now.

[douglas-reid]

@hklai I don't believe that this PR could be the cause of those failures. They (mostly) are init errors (with one prometheus test error -- which I think someone sent a PR to fix last week). Is it possible that something on Prow has changed ?

[hklai]

@douglas-reid i think i found the culprit and reverted it. #11331 (comment)

Rerunning the test now.

[istio-testing]

@hklai: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
prow/istio-pilot-multicluster-e2e.sh	b044314	link	/test istio-pilot-multicluster-e2e
prow/istio-integ-k8s-tests.sh	b044314	link	/test istio-integ-k8s-tests

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.

[googlebot]

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

[hklai]

All required tests have passed. Merging.