Commit Graph

62818 Commits

Author SHA1 Message Date
Shyam Jeedigunta
62f62fc93a Revert "[Test change - don't merge] Skip load test"
This reverts commit ba6bb999f7.
2018-03-09 13:06:50 +01:00
Kubernetes Submit Queue
17d69c296e
Merge pull request #60959 from feiskyer/external-ip
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Set node external IP for azure node when disabling UseInstanceMetadata

**What this PR does / why we need it**:

This PR sets node external IP for azure node disabling UseInstanceMetadata.

It also adds a check of whether it is running locally when UseInstanceMetadata.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #60958

**Special notes for your reviewer**:

**Release note**:

```release-note
Set node external IP for azure node when disabling UseInstanceMetadata
```
2018-03-08 22:21:37 -08:00
Kubernetes Submit Queue
0aad894b9d
Merge pull request #60365 from CaoShuFeng/example_test
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

clean up elasticsearch from unit test

The example of elasticsearch has been removed.

**Release note**:
```release-note
NONE
```
2018-03-08 21:06:33 -08:00
Pengfei Ni
3ae114cf08 Get external IP for azure standard nodes 2018-03-09 11:10:44 +08:00
Pengfei Ni
717fe5d0d6 Check whether it is running locally when UseInstanceMetadata 2018-03-09 11:09:33 +08:00
Kubernetes Submit Queue
8f8201691e
Merge pull request #60450 from verult/repd-beta-integration
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Change regional PD cloud provider references to use the beta API

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #59988

**Special notes for your reviewer**: Depends on a version of the GCP Go beta compute client that is not yet available. Also need to rebase with #60337 once it's merged.

/hold
/cc @abgworrall 
/assign @saad-ali
2018-03-08 16:27:05 -08:00
Kubernetes Submit Queue
71b40cbce5
Merge pull request #60943 from jennybuckley/webhook-https-url
Automatic merge from submit-queue (batch tested with PRs 60906, 60943). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Make admission webhooks honor scheme part of url

**What this PR does / why we need it**:
Bug fix, allow webhooks to use the scheme provided in clientConfig, instead of defaulting to http.
(more in issue)

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #60942

```release-note
Bug fix, allow webhooks to use the scheme provided in clientConfig, instead of defaulting to http.
```

/kind bug
/sig api-machinery
2018-03-08 15:18:46 -08:00
Kubernetes Submit Queue
a5a81da4f3
Merge pull request #60906 from MrHohn/e2e-restart-apiserver-refine
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

[e2e service] Refine apiserver restart logic

**What this PR does / why we need it**:
Ref https://github.com/kubernetes/kubernetes/issues/60761#issuecomment-371308569, wait for apiserver's restart count increases before proceeding the test.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes (hopefully) #60761

**Special notes for your reviewer**:
/assign @rramkumar1 @bowei 

**Release note**:

```release-note
NONE
```
2018-03-08 14:32:42 -08:00
Kubernetes Submit Queue
bcfdb39824
Merge pull request #60867 from Random-Liu/update-cadvisor
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update cadvisor to v0.29.1

Update cadvisor to v0.29.1 to include a bug fix for containerd integration. https://github.com/google/cadvisor/pull/1894

**Release note**:

```release-note
none
```
2018-03-08 13:49:23 -08:00
Kubernetes Submit Queue
9501c525a6
Merge pull request #60935 from shyamjvs/increase-volume-binder-log-verbosity
Automatic merge from submit-queue (batch tested with PRs 60891, 60935). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Increase verbosity of frequently printed logline in scheduler_binder

Fix https://github.com/kubernetes/kubernetes/issues/60933

/cc @wojtek-t @msau42 

```release-note
NONE
```

/milestone 1.10
/sig storage
2018-03-08 12:45:50 -08:00
Kubernetes Submit Queue
56195fd1d3
Merge pull request #60891 from shyamjvs/go-back-to-etcd-3.1.10
Automatic merge from submit-queue (batch tested with PRs 60891, 60935). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Rollback etcd server version to 3.1.11 due to #60589

Ref https://github.com/kubernetes/kubernetes/issues/60589#issuecomment-371171837

The dependencies were a bit complex (so many things relying on it) + the version was updated to 3.2.16 on top of the original bump.
So I had to mostly make manual reverting changes on a case-by-case basis - so likely to have errors :)

/cc @wojtek-t @jpbetz 

```release-note
Downgrade default etcd server version to 3.1.11 due to #60589
```

(I'm not sure if we should instead remove release-notes of the original PRs)
2018-03-08 12:45:46 -08:00
jennybuckley
7d5696eb6d Make admission webhooks not ignore scheme 2018-03-08 11:35:13 -08:00
Shyam Jeedigunta
8ff1f05f7c Increase verbosity of frequently printed logline in scheduler_binder 2018-03-08 19:25:01 +01:00
Shyam Jeedigunta
ba6bb999f7 [Test change - don't merge] Skip load test 2018-03-08 13:07:21 +01:00
Shyam Jeedigunta
21f5e69f08 Rollback etcd server version to 3.1.11 due to #60589 2018-03-08 13:07:15 +01:00
Kubernetes Submit Queue
a0844c17bf
Merge pull request #60682 from hanxiaoshuai/update0302
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

update Mount propagation version in comment

**What this PR does / why we need it**:
Mount propagation feature was moved to beta in PR [#59252](https://github.com/kubernetes/kubernetes/pull/59252), so update the comment.
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #60657 

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-03-07 17:20:04 -08:00
Zihong Zheng
a25187329b [e2e service] Refine apiserver restart logic 2018-03-07 16:26:17 -08:00
Lantao Liu
360159037a Update cadvisor to v0.29.1 2018-03-07 23:33:57 +00:00
Cheng Xing
df3d8bcba6 Vendor newest GCP Go client 2018-03-07 14:03:10 -08:00
Anago GCB
d112ffc2eb Update CHANGELOG-1.10.md for v1.10.0-beta.2. 2018-03-07 21:17:37 +00:00
Cheng Xing
10cc971388 Change regional PD cloud provider references to use the beta API 2018-03-07 13:15:34 -08:00
Kubernetes Submit Queue
c74c826452
Merge pull request #60627 from dims/create-fake-etc-hosts-for-conformance-test
Automatic merge from submit-queue (batch tested with PRs 60642, 60627). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Create fake /etc/hosts for conformance test

**What this PR does / why we need it**:

    "KubeletManagedEtcHosts should test kubelet managed /etc/hosts file"
    conformance test fails in the CI's Docker-In-Docker environment.

    This test mounts a /etc/hosts file and checks if "# Kubernetes-managed
    hosts file." string is present or not under various conditions. The
    specific failure with DIND happens when the /etc/hosts picked up
    from the box where e2e test are running already has this string. This
    happens because our CI runs on kubernetes and the e2e tests are running
    in a container that was started on kubernetes (and hence already has
    that string)

    To avoid this situation, we create a new /etc/hosts file with known
    contents (and does not have the "# Kubernetes-managed hosts file."
    string)

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:
Please see:
https://k8s-testgrid.appspot.com/sig-testing-misc#ci-kubernetes-local-e2e
https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-local-e2e/285

**Release note**:

```release-note
NONE
```
2018-03-07 12:40:47 -08:00
Kubernetes Submit Queue
e9f996bfe2
Merge pull request #60642 from rajansandeep/removepodaffinity
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Reverting the anti-affinity from CoreDNS pods

**What this PR does / why we need it**:
Following #54164 and #59357, removing the anti-affinity from CoreDNS.
 
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-03-07 12:17:12 -08:00
Kubernetes Submit Queue
bad8e0d91c
Merge pull request #60838 from CaoShuFeng/amdission_controller_glog
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

log enabled admission controller in order

After switching to --enable-admission-plugins/--disable-admission-plugins, some admission controller may start silently. And these admission controllers may modify or forbid objects. This pull request does a lot of help for admin to trouble shooting.

/assign @hzxuzhonghu @sttts 

**Release note**:
```release-note
NONE
```
2018-03-07 11:21:13 -08:00
Kubernetes Submit Queue
07c04c2a17
Merge pull request #60874 from cblecker/cblecker-test-approver
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add cblecker to test OWNERS

**What this PR does / why we need it**:
- Adds an OWNERS file for `test/typecheck/` that was just added
- Add cblecker to approvers for `test/`

I won't touch anything I don't understand :)

**Release note**:
```release-note
NONE
```
2018-03-07 10:33:59 -08:00
Kubernetes Submit Queue
b30fed0770
Merge pull request #60144 from alinbalutoiu/master
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add support for binaries to run as Windows services

**What this PR does / why we need it**:
Add support for binaries to run as Windows services

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #59562

**Special notes for your reviewer**:

**Release note**:
```release-note
kubelet and kube-proxy can now be ran as Windows services
```
2018-03-07 10:33:41 -08:00
Kubernetes Submit Queue
5364f7beb8
Merge pull request #60880 from wojtek-t/fix_pod_to_selectable_fields
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Avoid reallocating of map in PodToSelectableFields

Ref #60589
2018-03-07 05:07:20 -08:00
wojtekt
6786d6691a Avoid reallocating of map in PodToSelectableFields 2018-03-07 12:26:02 +01:00
Kubernetes Submit Queue
891b471064
Merge pull request #60808 from jpbetz/etcd-migrate-tls
Automatic merge from submit-queue (batch tested with PRs 60872, 60808). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Pass in etcd TLS credentials during migrate and rollback

For HA etcd clusters, the `etcd-creds` settings, specifically the `--peer-*` TLS flags that may be included, must be passed in to `start-stop-etcd.sh` in order for the etcd server mode started during migrate and rollback steps to be able to communicate between peers.

The `etcd.manifest` change needs to be backported all the way back to 1.7.

**Release note**:
```release-note
NONE
```
2018-03-07 00:12:49 -08:00
Kubernetes Submit Queue
21467498f7
Merge pull request #60872 from krzyzacy/fix-kubemark
Automatic merge from submit-queue (batch tested with PRs 60872, 60808). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

purge all the -v references from e2e.go

cf for https://github.com/kubernetes/kubernetes/issues/60870

probably need to work together with https://github.com/kubernetes/test-infra/pull/7164
2018-03-07 00:12:46 -08:00
Christoph Blecker
bf063aa6b1
Add OWNERS file to test/typecheck/ 2018-03-06 22:35:47 -08:00
Christoph Blecker
b2d62fcd5d
Add cblecker to test/ approvers 2018-03-06 22:35:26 -08:00
Sen Lu
b01d2ba048 purge all the -v references from e2e.go 2018-03-06 20:36:06 -08:00
Cao Shufeng
4c6db2516a log enabled admission controller in order 2018-03-07 10:18:11 +08:00
Kubernetes Submit Queue
f196b7c752
Merge pull request #60805 from ericchiang/oidc-owners
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

oidc: add rithujohn191 as a reviewer

cc @rithujohn191

/sig auth
/kind documentation

```release-note
NONE
```
2018-03-06 16:04:42 -08:00
Alin-Gheorghe Balutoiu
448ed6e875 Add sys/windows/svc to vendor
This is needed for service manager support on Windows
in kubernetes binaries.
2018-03-07 00:51:42 +01:00
Alin-Gheorghe Balutoiu
4ea363d98e Add support for binaries to run as Windows services
This patch adds support for kubernetes to integrate
with Windows SCM.

As a first step both `kubelet` and `kube-proxy` can be registered as a service.

To create the service:
PS > sc.exe create <component_name> binPath= "<path_to_binary> --service <other_args>"
CMD > sc create <component_name> binPath= "<path_to_binary> --service <other_args>"

Please note that if the arguments contain spaces, it must be escaped.
Example:
PS > sc.exe create kubelet binPath= "C:\kubelet.exe --service --hostname-override 'minion' <other_args>"
CMD > sc create kubelet binPath= "C:\kubelet.exe --service --hostname-override 'minion' <other_args>"

Example to start the service:
PS > Start-Service kubelet; Start-Service kube-proxy
CMD > net start kubelet && net start kube-proxy

Example to stop the service:
PS > Stop-Service kubelet (-Force); Stop-Service kube-proxy (-Force)
CMD > net stop kubelet && net stop kube-proxy

Example to query the service:
PS > Get-Service kubelet; Get-Service kube-proxy;
CMD > sc.exe queryex kubelet && sc qc kubelet && sc.exe queryex kube-proxy && sc.exe qc kube-proxy

Signed-off-by: Alin Balutoiu <abalutoiu@cloudbasesolutions.com>
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Co-authored-by: Alin Gabriel Serdean <aserdean@ovn.org>
2018-03-07 00:51:36 +01:00
Kubernetes Submit Queue
fad7ca836d
Merge pull request #59224 from crimsonfaith91/ds-integration
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

improve daemonset's retry creating failed daemon pods e2e test

**What this PR does / why we need it**:
This PR improves daemonset's retry creating failed daemon pods e2e test by checking that the failed pod does not show up among existing daemon pods.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #59076

**Release note**:
```release-note
NONE
```
2018-03-06 15:23:58 -08:00
Kubernetes Submit Queue
86ca3afb4d
Merge pull request #60840 from pohly/e2e_csi_create
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fixing e2e CSI test, II

The fix for #60803 in commit 2ae33cc324 had a typo, so the "Server
rejected event" error still showed up in the external-provisioner log
of the "Sanity CSI plugin test using hostPath CSI driver" e2e test.

```release-note
None
```
2018-03-06 10:45:05 -08:00
Kubernetes Submit Queue
9aae9b58a5
Merge pull request #59836 from jpbetz/etcd-3.2.16-patch-upgrade
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump etcd server patch version to 3.2.16

etcd 3.2.16 contains a critical fix for HA clusters: https://github.com/coreos/etcd/pull/9281

Also, update newly added tests to use `REGISTRY` make variable.

Release note:
```release-note
Upgrade the default etcd server version to 3.2.16
```
2018-03-06 10:00:53 -08:00
Kubernetes Submit Queue
a83aec0a0c
Merge pull request #60794 from crassirostris/fix-audit-e2e
Automatic merge from submit-queue (batch tested with PRs 60630, 60794). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add retrying to audit logging e2e tests

Fixes https://github.com/kubernetes/kubernetes/issues/60719

Adds retrying to the audit logging e2e tests so it can work when audit logging is in batch mode and actual writing is delayed.

```release-note
NONE
```

/cc @tallclair @liggitt @sttts
2018-03-06 08:39:48 -08:00
Kubernetes Submit Queue
3511f708cb
Merge pull request #60630 from CaoShuFeng/scale_job
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove "scale job" from help info

Remove "scale job" from help info since it's deprecated



**What this PR does / why we need it**:

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

/assign @deads2k @soltysh
2018-03-06 07:35:44 -08:00
Kubernetes Submit Queue
6c5838e54e
Merge pull request #60842 from mwielgus/ca-1.1.2
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump Cluster Autoscaler to 1.1.2

Contains fixes around GPUs and base image change.
```release-note
Cluster Autoscaler 1.1.2 
```
2018-03-06 06:55:08 -08:00
Mik Vyatskov
f327a2a4c0 Add retrying to audit logging e2e tests
Signed-off-by: Mik Vyatskov <vmik@google.com>
2018-03-06 14:56:56 +01:00
Kubernetes Submit Queue
48a7048d98
Merge pull request #60747 from dims/fix-daemonset-conformance-test-failure-and-remove-unused-code
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix test failure and delete unused code

**What this PR does / why we need it**:
`Daemon set [Serial] should update pod when spec was updated and update strategy is RollingUpdate` is broken by recent updates as Template generation isn't supported by apps/v1.DaemonSet anymore

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #60745 

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-03-06 05:41:06 -08:00
Kubernetes Submit Queue
100d82935a
Merge pull request #60503 from serathius/fix-passing-location
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

[fluentd-gcp addon] Fix passing location to event exporter

Fix passing argument to event-expoter in https://github.com/kubernetes/kubernetes/pull/58090

```release-note
NONE
```
2018-03-06 04:54:28 -08:00
Davanum Srinivas
ba20e63446 Create fake /etc/hosts for conformance test
"KubeletManagedEtcHosts should test kubelet managed /etc/hosts file"
conformance test fails in the CI's Docker-In-Docker environment.

This test mounts a /etc/hosts file and checks if "# Kubernetes-managed
hosts file." string is present or not under various conditions. The
specific failure with DIND happens when the /etc/hosts picked up
from the box where e2e test are running already has this string. This
happens because our CI runs on kubernetes and the e2e tests are running
in a container that was started on kubernetes (and hence already has
that string)

To avoid this situation, we create a new /etc/hosts file with known
contents (and does not have the "# Kubernetes-managed hosts file."
string)
2018-03-06 06:51:41 -05:00
Marcin Wielgus
16f050bd99 Bump Cluster Autoscaler to 1.1.2 2018-03-06 12:34:51 +01:00
Patrick Ohly
17d9a0c5ab Fixing e2e CSI test, II
The fix for #60803 in commit 2ae33cc324 had a typo, so the "Server
rejected event" error still showed up in the external-provisioner log
of the "Sanity CSI plugin test using hostPath CSI driver" e2e test.
2018-03-06 11:43:25 +01:00
Kubernetes Submit Queue
7e98a3ad7c
Merge pull request #60797 from soltysh/issue60765
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Run server-side print tests only on k8s 1.10+

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #60765

**Release note**:
```release-note
None
```

/assign @smarterclayton @deads2k 
@juanvallejo fyi
2018-03-06 02:12:40 -08:00