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 ```

Merge pull request #48874 from juju-solutions/feature/sync-channels
013d37d8 · Kubernetes Submit Queue · GitHub · d3ff93ef · ca0f0428 · 013d37d8
Commit 013d37d8 authored Jul 17, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 17, 2017
Showing with 3 additions and 3 deletions

config.yaml cluster/juju/layers/kubernetes-e2e/config.yaml +1 -1

config.yaml cluster/juju/layers/kubernetes-master/config.yaml +1 -1

config.yaml cluster/juju/layers/kubernetes-worker/config.yaml +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-e2e/config.yaml
+++ b/cluster/juju/layers/kubernetes-e2e/config.yaml
 options:
  channel:
    type: string
-    default: "stable"
+    default: "1.7/stable"
    description: |
      Snap channel to install Kubernetes snaps from
--- a/cluster/juju/layers/kubernetes-master/config.yaml
+++ b/cluster/juju/layers/kubernetes-master/config.yaml
@@ -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:

--- a/cluster/juju/layers/kubernetes-worker/config.yaml
+++ b/cluster/juju/layers/kubernetes-worker/config.yaml
@@ -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: