Merge pull request #48874 from juju-solutions/feature/sync-channels

Automatic merge from submit-queue (batch tested with PRs 49019, 48919, 49040, 49018, 48874)

Set default snap channel on charms to 1.7 stable

**What this PR does / why we need it**: This PR sets the default snap channel on charms to 1.7/stable. 
This addresses problems where the the user might want to deploy the charm and get the same kubernetes version found on the bundles.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/305

**Special notes for your reviewer**:

**Release note**:

```Set default snap channel on charms to 1.7/stable
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-17 21:25:13 -07:00 committed by GitHub
commit 013d37d881
3 changed files with 3 additions and 3 deletions

View File

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

View File

@ -23,7 +23,7 @@ options:
detected on a worker node.
channel:
type: string
default: "stable"
default: "1.7/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: "stable"
default: "1.7/stable"
description: |
Snap channel to install Kubernetes worker services from
require-manual-upgrade: