github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51200 from Cynerva/gkk/revert-default-service-cidr

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51193, 51154, 42689, 51189, 51200)

Revert default service-cidr config on kubernetes-master charm

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

This reverts the default service-cidr config in the kubernetes-master charm.

A while back, we changed the default service-cidr in the kubernetes-master charm from `10.152.183.0/24` to `10.152.0.0/16`. In testing, we have found that the charms don't handle this change well, so we are reverting it until we can make the change more safely.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-08-24 04:38:12 -07:00 committed by GitHub
commit 44fc084bd2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/layers/kubernetes-master/config.yaml
View File

@ -9,7 +9,7 @@ options:
description: The local domain for cluster dns
service-cidr:
type: string
default: 10.152.0.0/16
default: 10.152.183.0/24
description: CIDR to user for Kubernetes services. Cannot be changed after deployment.
allow-privileged:
type: string