Merge pull request #62115 from juju-solutions/feature/1.10-defaults

Automatic merge from submit-queue (batch tested with PRs 61705, 61609, 62103, 62113, 62115). 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>.

Configure the default channel to 1.10/stable

**What this PR does / why we need it**: Prepare to release kubernetes charms for 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 #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-04-04 10:27:20 -07:00 committed by GitHub
commit 7fed970f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
options:
channel:
type: string
default: "1.9/stable"
default: "1.10/stable"
description: |
Snap channel to install Kubernetes snaps from

View File

@ -41,7 +41,7 @@ options:
will not be loaded.
channel:
type: string
default: "1.9/stable"
default: "1.10/stable"
description: |
Snap channel to install Kubernetes master services from
client_password:

View File

@ -22,7 +22,7 @@ options:
switch to privileged mode if gpu hardware is detected.
channel:
type: string
default: "1.9/stable"
default: "1.10/stable"
description: |
Snap channel to install Kubernetes worker services from
require-manual-upgrade: