Merge lp:~mbruzek/charms/bundles/kubernetes-cluster/bundle into lp:~kubernetes/charms/bundles/kubernetes-cluster/bundle

[Matt Bruzek]

Updating the bundle to reference the next revision of the kubernetes and kuberentes-master charms that have finally passed CI. Those changes involve getting kubernetes and kuberentes-master charms in sync with github.

This proposal depends on the other two charm proposals landing, and should be done last.

Only merge this proposal if the following proposals have been merged.
https://code.launchpad.net/~mbruzek/charms/trusty/kubernetes/trunk/+merge/273993
https://code.launchpad.net/~mbruzek/charms/trusty/kubernetes-master/trunk/+merge/273994

[Charles Butler (lazypower)]

I'm holding off on merging this until we get a green test run attached, however I merged the other two dependent branches.

[lp:~mbruzek/charms/bundles/kubernetes-cluster/bundle]

22. By Matt Bruzek on 2015-10-09

Correcting misspelled charm uri in bundle.

[Matt Bruzek (mbruzek)]

Good point Chuck.

http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/989/console

It looks like it passed the tests on AWS

[Charles Butler (lazypower)]

+1 LGTM

Charles Butler <email address hidden> - Juju Charmer
Come see the future of datacenter orchestration: http://jujucharms.com

On Fri, Oct 9, 2015 at 8:44 PM, Matt Bruzek <email address hidden>
wrote:

> Good point Chuck.
>
> http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/989/console
>
> It looks like it passed the tests on AWS
> --
>
> https://code.launchpad.net/~mbruzek/charms/bundles/kubernetes-cluster/bundle/+merge/273996
> You are requested to review the proposed merge of
> lp:~mbruzek/charms/bundles/kubernetes-cluster/bundle into
> lp:~kubernetes/charms/bundles/kubernetes-cluster/bundle.
>

[Matt Bruzek (mbruzek)]

Based on the tests passing I am going to merge this bundle.

http://reports.vapour.ws/charm-test-details/charm-bundle-test-parent-1138

=== modified file 'bundle.yaml'
--- bundle.yaml	2015-10-01 03:55:32 +0000
+++ bundle.yaml	2015-10-09 22:15:49 +0000
@@ -1,6 +1,6 @@
 services:
   "kubernetes-master":
-    charm: cs:~kubernetes/trusty/kubernetes-master-10
+    charm: cs:~kubernetes/trusty/kubernetes-master-11
     constraints: "cpu-cores=2 mem=2G"
     annotations:
       "gui-x": "600"
@@ -22,7 +22,7 @@
       "gui-x": "0"
       "gui-y": "300"
   kubernetes:
-    charm: cs:~kubernetes/trusty/kubernetes-10
+    charm: cs:~kubernetes/trusty/kubernetes-11
     annotations:
       "gui-x": "300"
       "gui-y": "300"

=== modified file 'bundles.yaml'
--- bundles.yaml	2015-10-01 03:55:32 +0000
+++ bundles.yaml	2015-10-09 22:15:49 +0000
@@ -1,7 +1,8 @@
 kubernetes-cluster:
   services:
     "kubernetes-master":
-      charm: cs:~kubernetes/trusty/kubernetes-master-10
+      charm: cs:~kubernetes/trusty/kubernetes-master-11
+      constraints: "cpu-cores=2 mem=2G"
       annotations:
         "gui-x": "600"
         "gui-y": "0"
@@ -22,7 +23,7 @@
         "gui-x": "0"
         "gui-y": "300"
     kubernetes:
-      charm: cs:~kubernetes/trusty/kubernetes-10
+      charm: cs:~kubernetes/trusty/kubernetes-11
       annotations:
         "gui-x": "300"
         "gui-y": "300"