Commit Graph

6790 Commits

Author SHA1 Message Date
Jeff Grafton
924fd3b058 Update helper scripts to find binaries in new bazel-bin paths 2017-12-23 13:13:09 -08:00
Jeff Grafton
efee0704c6 Autogenerate BUILD files 2017-12-23 13:12:11 -08:00
Tim Hockin
e9dd8a68f6 Revert k8s.gcr.io vanity domain
This reverts commit eba5b6092a.

Fixes https://github.com/kubernetes/kubernetes/issues/57526
2017-12-22 14:36:16 -08:00
Kubernetes Submit Queue
90b12413f2
Merge pull request #57296 from xiangpengzhao/update-coredns-corefile
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 CoreDNS version and Corefile in kubeadm

**What this PR does / why we need it**:
We bumped CoreDNS version to 1.0.0 (#56802) and added CoreDNS as an optional addon in kube-up (#55728), but something wrt log was missed.  The log option of CoreDNS was changed since 1.0.0. We should update the Corefile to reflect the change.

**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 https://github.com/kubernetes/kubernetes/issues/57277

ref: https://github.com/coredns/coredns/issues/1218 https://github.com/coredns/coredns/pull/1221

**Special notes for your reviewer**:
/cc @luxas @rajansandeep
cc @fturib @johnbelamaric

**Release note**:

```release-note
NONE
```
2017-12-21 09:49:22 -08:00
Kubernetes Submit Queue
8bd5a46016
Merge pull request #57192 from kawych/dashboard
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>.

Reduce CPU request of Dashboard addon

**What this PR does / why we need it**:
This PR reduces request of Dashboard addon to free up cluster resources for user pods and other addons. Dashboard is bound on memory and under-utilizes CPU

**Release note**:
```release-note
NONE
```
2017-12-21 09:10:33 -08:00
Kubernetes Submit Queue
25328abdcf
Merge pull request #56259 from msau42/local-ssd
Automatic merge from submit-queue (batch tested with PRs 54278, 56259, 56762). 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 NODE_LOCAL_SSDS_EXT to config-test

**What this PR does / why we need it**:
Add NODE_LOCAL_SSDS_EXT to config-test so we can specify it for CI.

**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 #57468

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2017-12-20 12:32:35 -08:00
Kubernetes Submit Queue
8d309aa04c
Merge pull request #57458 from juju-solutions/bug/evicted
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>.

Evicted pods should not be marked as failing since they respawn

**What this PR does / why we need it**: Juju deployments should not report evicted pods as failing.

**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**:

```NONE

```
2017-12-20 11:42:33 -08:00
Kubernetes Submit Queue
dd9bca89ad
Merge pull request #57252 from kawych/ms_res
Automatic merge from submit-queue (batch tested with PRs 57252, 57168). 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>.

Reduce CPU and memory requests for Metrics Server Nanny

**What this PR does / why we need it**:
Metrics Server Nanny is a sidecar container that performs small computations every 5 minutes to scale Metrics Server resource requirements when cluster size changes. This change reduces the CPU and memory requests to free up unused resource.

**Release note**:
```release-note
Free up CPU and memory requested but unused by Metrics Server Pod Nanny.
```
2017-12-20 07:48:32 -08:00
Konstantinos Tsakalozos
bd8eaa7f18 Even better 2017-12-20 17:25:54 +02:00
Konstantinos Tsakalozos
c9688155f6 Much better 2017-12-20 17:14:00 +02:00
Konstantinos Tsakalozos
d3ca7a0eb8 reason key should exist 2017-12-20 16:56:18 +02:00
Konstantinos Tsakalozos
b2a6eb99c1 Evicted pods should respawn 2017-12-20 16:30:07 +02:00
Kubernetes Submit Queue
f302487942
Merge pull request #57238 from wojtek-t/push_3_1_11_etcd_image
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>.

Build etcd image for 3.1.11 version

This is fixing some bugs in HA setups.

It should be cherrypicked to 1.9 branch.
2017-12-19 14:53:40 -08:00
Kubernetes Submit Queue
4db2245a9f
Merge pull request #57403 from wwwtyro/rye/deprecated-dns-ip-handling
Automatic merge from submit-queue (batch tested with PRs 57400, 57403, 57303). 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>.

Use old dns-ip mechanism with older cdk-addons.

**What this PR does / why we need it**: Use old dns-ip mechanism with older cdk-addons.

**Release note**:
```release-note
Use old dns-ip mechanism with older cdk-addons.
```
2017-12-19 11:27:35 -08:00
Kubernetes Submit Queue
866d1bed6b
Merge pull request #57400 from juju-solutions/feature/prep-1.9-release
Automatic merge from submit-queue (batch tested with PRs 57400, 57403, 57303). 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>.

Pointing juju charms to 1.9

**What this PR does / why we need it**: Point juju charms to 1.9 k8s release

**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**:

```NONE

```
2017-12-19 11:27:32 -08:00
Kubernetes Submit Queue
bf12b51105
Merge pull request #57394 from mborsz/retry
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 --retry-connrefused to all curl invocations if available.

By default 'Connection refused' error is not a transient error
and is not retried.



**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
Retry 'connection refused' errors when setting up clusters on GCE.
```
2017-12-19 09:20:05 -08:00
Kubernetes Submit Queue
1fdb164c6a
Merge pull request #57376 from juju-solutions/bug/more-lint
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>.

Minor lint fix on Juju master

**What this PR does / why we need it**: Fix lint error in master

**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**:

```NONE

```
2017-12-19 07:25:34 -08:00
Rye Terrell
d8e3861991 Use old dns-ip mechanism with older cdk-addons. 2017-12-19 07:48:16 -06:00
Maciej Borsz
95dccb4b82 Add --retry-connrefused to all curl invocations.
By default 'Connection refused' error is not a transient error
and is not retried.
2017-12-19 14:10:37 +01:00
Konstantinos Tsakalozos
f2da078168 Pointing juju charms to 1.9 2017-12-19 14:48:05 +02:00
Wojciech Tyczynski
484460db9a Build and push 3.1.11 etcd image 2017-12-19 09:49:51 +01:00
Maciej Borsz
249ddd762c
Revert "Add --retry-connrefused to all curl invocations." 2017-12-19 09:47:25 +01:00
Konstantinos Tsakalozos
f4e8385a3b Minor lint fix 2017-12-19 09:13:28 +02:00
xiangpengzhao
8c8cdfe7b7 Update CoreDNS version and Corefile. 2017-12-19 12:10:02 +08:00
Kubernetes Submit Queue
f99485c9f5
Merge pull request #57347 from ihmccreery/no-scopes
Automatic merge from submit-queue (batch tested with PRs 55751, 57337, 56406, 56864, 57347). 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 comment to gce config files advising to use non-empty scopes

**What this PR does / why we need it**: Add a comment in gce config files advising to use non-empty scopes, because kubelet requires a service account to initialize.

**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
```
2017-12-18 18:50:47 -08:00
Kubernetes Submit Queue
4c36d487f0
Merge pull request #57337 from wwwtyro/rye/wait-kube-dns
Automatic merge from submit-queue (batch tested with PRs 55751, 57337, 56406, 56864, 57347). 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>.

Wait for kubedns to be ready when collecting the cluster IP.

**What this PR does / why we need it**: Wait for kubedns to be ready when collecting the cluster IP.

**Release note**:
```release-note
Wait for kubedns to be ready when collecting the cluster IP.
```
2017-12-18 18:50:40 -08:00
Kubernetes Submit Queue
e5abffca6f
Merge pull request #54174 from thockin/gcr-vanity
Automatic merge from submit-queue (batch tested with PRs 54379, 56593, 56685, 54174, 57309). 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>.

Use k8s.gcr.io vanity domain for container images

Related issue: https://github.com/kubernetes/release/issues/281

```release-note
Use "k8s.gcr.io" for container images rather than "gcr.io/google_containers".  This is just a redirect, for now, so should not impact anyone materially.  

Documentation and tools should all convert to the new name. Users should take note of this in case they see this new name in the system.
```
2017-12-18 14:45:45 -08:00
Kubernetes Submit Queue
4956e65d59
Merge pull request #57314 from juju-solutions/fix/lb-lint
Automatic merge from submit-queue (batch tested with PRs 56947, 56349, 57140, 53686, 57314). 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 lint errors on Juju LB

**What this PR does / why we need it**: This lint fixes block the build of the juju charms.

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


**Special notes for your reviewer**:

**Release note**:

```NONE

```
2017-12-18 12:24:46 -08:00
Isaac Hollander McCreery
3fa0a781af Add comment to gce config files advising to not use empty scopes 2017-12-18 11:33:21 -08:00
Tim Hockin
f7be352a67 gcloud docker now auths k8s.gcr.io by default 2017-12-18 09:18:34 -08:00
Tim Hockin
eba5b6092a Use k8s.gcr.io vanity domain for container images 2017-12-18 09:18:34 -08:00
Kubernetes Submit Queue
55a60032e7
Merge pull request #56965 from kawych/nanny
Automatic merge from submit-queue (batch tested with PRs 57324, 56931, 57000, 57150, 56965). 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 Heapster and Metrics Server configuration to enable overriding resource requirements.

**What this PR does / why we need it**:
Configure resources for Heapster and Metrics Servier using Component Config. This will enable overriding default resource requirements for these components.

**Release note**:
```release-note
Fix Heapster configuration and Metrics Server configuration to enable overriding default resource requirements.
```
2017-12-18 08:46:52 -08:00
Rye Terrell
23c81bb3d4 wait for kubedns to be ready 2017-12-18 09:28:03 -06:00
Maciej Borsz
d9bb71b1fe Add --retry-connrefused to all curl invocations.
By default 'Connection refused' error is not a transient error
and is not retried.
2017-12-18 13:34:33 +01:00
Karol Wychowaniec
bb159cf26a Reduce CPU and memory requests for Metrics Server Nanny 2017-12-18 11:54:13 +01:00
Konstantinos Tsakalozos
adf3c21495 Fix LB lint errors 2017-12-18 10:56:34 +02:00
Kubernetes Submit Queue
d117e86e60
Merge pull request #57204 from yujuhong/bump-cos-version
Automatic merge from submit-queue (batch tested with PRs 56386, 57204, 55692, 57107, 57177). 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>.

GCE: bump COS image version to cos-stable-63-10032-71-0

```release-note
GCE: bump COS image version to cos-stable-63-10032-71-0
```
2017-12-17 04:19:39 -08:00
Kubernetes Submit Queue
d0a667bdd3
Merge pull request #56386 from dixudx/fix_gnu_cp
Automatic merge from submit-queue (batch tested with PRs 56386, 57204, 55692, 57107, 57177). 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>.

don't use gnu cp features in building etcd image

**What this PR does / why we need it**:
> cp: illegal option -- t

use gnu-cp to copy files

**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 #56383

**Special notes for your reviewer**:
/assign @ixdy @mkumatag 

**Release note**:

```release-note
None
```
2017-12-17 04:19:36 -08:00
Kubernetes Submit Queue
cab439b20f
Merge pull request #57195 from marcoceppi/s390x-fixes
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>.

Use an s390x default-http-backend

This needs to be refactored to eventually say all non x86 architectures place a -arch() in the image name to support ppc64el, arm, etc.

Most all gcr.io/google_containers have -arch() image names.


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

Adds s390x images for when deploying to z system mainframes for default-http-backend image

**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 https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/455

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2017-12-17 00:54:22 -08:00
Kubernetes Submit Queue
587204149a
Merge pull request #56927 from x13n/patch-2
Automatic merge from submit-queue (batch tested with PRs 57122, 57142, 57016, 56927, 56678). 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 fluentd-gcp version

**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)*:

**Special notes for your reviewer**:

**Release note**:

```release-note
fluentd-gcp updated to version 2.0.11.
```
2017-12-16 23:32:43 -08:00
Kubernetes Submit Queue
2124d30502
Merge pull request #57122 from caseydavenport/tolerate-taints
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>.

Schedule Calico components even on tainted nodes

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

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

**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
calico-node addon tolerates all NoExecute and NoSchedule taints by default.
```

@dnardo
2017-12-16 21:47:45 -08:00
Kubernetes Submit Queue
3492467178
Merge pull request #57113 from wwwtyro/rye/optional-kube-dns
Automatic merge from submit-queue (batch tested with PRs 56676, 57050, 54881, 56822, 57113). 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 kube-dns addon optional

**What this PR does / why we need it**: Makes the kube-dns addon optional so that users can deploy their own DNS solution.

**Release note**:
```release-note
Makes the kube-dns addon optional so that users can deploy their own DNS solution.
```
2017-12-16 19:19:49 -08:00
Kubernetes Submit Queue
4fb55d9136
Merge pull request #57052 from mikedanese/umask
Automatic merge from submit-queue (batch tested with PRs 56858, 57040, 56979, 57051, 57052). 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>.

gce: tighten up perms on kube-env

fixes https://github.com/kubernetes/kubernetes/issues/52999

@roberthbailey @tallclair
2017-12-16 16:34:50 -08:00
Kubernetes Submit Queue
1ad37c50ae
Merge pull request #57051 from dnardo/gke-deb
Automatic merge from submit-queue (batch tested with PRs 56858, 57040, 56979, 57051, 57052). 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 debian setup script to match GCI.

Even though this file is deprecated in 1.8 and 1.9, add this for consistency and this will also be cherry picked back to 1.7
2017-12-16 16:34:47 -08:00
Kubernetes Submit Queue
cb127830ff
Merge pull request #56979 from hyperbolic2346/mwilson/apilb-log-rotate
Automatic merge from submit-queue (batch tested with PRs 56858, 57040, 56979, 57051, 57052). 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>.

enabling log rotate for api logs in nginx

**What this PR does / why we need it**:
Prevent the load balancer from filling the disk with logs from the api server
**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 #
https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/449
**Special notes for your reviewer**:

**Release note**:

```release-note
Enabled log rotation for load balancer's api logs to prevent running out of disk space.
```
2017-12-16 16:34:44 -08:00
Kubernetes Submit Queue
a96d386ecd
Merge pull request #56894 from Shashwatsh/master
Automatic merge from submit-queue (batch tested with PRs 56894, 56940, 55223, 56554, 54985). 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 kube-up.sh; fixed a typo!

fixed a typo in kube-up.sh; ```libvert-coreos``` should be ```libvirt-coreos```
2017-12-16 13:49:51 -08:00
Kubernetes Submit Queue
8ae6202b7e
Merge pull request #56871 from jpbetz/etcd-version-monitor-3.1
Automatic merge from submit-queue (batch tested with PRs 56650, 55813, 56911, 56921, 56871). 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 etcd-version-monitor metrics proxying, add etcd 3.1 gprc metr…

Partially addresses https://github.com/kubernetes/kubernetes/issues/56869:

- Fix `etcd-version-monitor` to support etcd 3.1: Add support for the etcd 3.1+ [go-grpc-prometheus](https://github.com/grpc-ecosystem/go-grpc-prometheus) metrics format, which backward incompatibly replaces  the 3.0 legacy grpc metric format. Expose the go-grpc-prometheus metrics both in the 3.1 format and in the 3.0 format so systems consuming `etcd-version-monitor` metrics have a clean, simple upgrade path.
- Expose *all* etcd metrics by default, making this a one stop shop for all etcd metrics.
- Expose grpc request latency histogram metrics (`grpc_server_handling_seconds` from [go-grpc-prometheus](https://github.com/grpc-ecosystem/go-grpc-prometheus) metrics format). Rewrite etcd 3.0 legacy metric for latency histograms to the etcd 3.1+ `go-grpc-prometheus` format so there is a single format exported for all etcd versions.

etcd 3.0 to 3.1 upgrade path:  Continue to use the `etcd_grpc_requests_total`. Once the upgrade is complete and all etcd nodes are running 3.1, migrate to the `grpc_server_handled_total` metric at your leisure.

This PR reorganizes the code substantially. Previously, the code to proxy etcd metrics was hard coded and limited to a single counter metric. This has been entirely replaced with code that generically filters, rewrites proxied etcd metrics and then aggregates them with custom metrics such as the etcd version metric.

cc @wojtek-t @mml @shyamjvs @cheftako 

```release-note
Fix `etcd-version-monitor` to backward compatibly support etcd 3.1 [go-grpc-prometheus](https://github.com/grpc-ecosystem/go-grpc-prometheus) metrics format.
```
2017-12-16 12:10:54 -08:00
Kubernetes Submit Queue
7045364274
Merge pull request #55813 from ihmccreery/prom-to-sd-resource-limits
Automatic merge from submit-queue (batch tested with PRs 56650, 55813, 56911, 56921, 56871). 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>.

Reintroduce memory limits removed in #55715

**What this PR does / why we need it**: Reintroduce memory limits removed in #55715, in order to make metadata-proxy QoS be guaranteed.  Xref #55695.

**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 #55797

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2017-12-16 12:10:46 -08:00
Kubernetes Submit Queue
8b4c944248
Merge pull request #56809 from MrHohn/non-masq-test
Automatic merge from submit-queue (batch tested with PRs 56250, 56809, 56812, 56792, 56724). 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 NON_MASQUERADE_CIDR in gce/config-test

**What this PR does / why we need it**:
Ref https://github.com/kubernetes/kubernetes/issues/56727.

Follow up of https://github.com/kubernetes/kubernetes/pull/55178. Making test configuration consistent with normal cluster.

**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 #NONE 

**Special notes for your reviewer**:
/assign @dnardo @thockin 

**Release note**:

```release-note
NONE
```
2017-12-16 07:46:40 -08:00
Kubernetes Submit Queue
7a3fa9d58e
Merge pull request #56633 from juju-solutions/bug/restarts
Automatic merge from submit-queue (batch tested with PRs 56337, 56546, 56550, 56633, 56635). 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 do-restart states

**What this PR does / why we need it**: Simplify juju reactive part of the master.

**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 https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/448

**Special notes for your reviewer**:

**Release note**:

```NONE```
2017-12-16 01:53:52 -08:00