Merge pull request kubernetes#22726 from chuckbutler/juju-import-layers

Auto commit by PR queue bot
lavalamp · Mar 23, 2016 · 69b3cb3 · 69b3cb3
2 parents f4b948b + cc1fb15
commit 69b3cb3
Show file tree

Hide file tree

Showing 70 changed files with 801 additions and 2,513 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,6 +88,9 @@ doc_tmp/
 # CoreOS stuff
 cluster/libvirt-coreos/coreos_*.img
 
+# Juju Stuff
+cluster/juju/charms/*
+
 # Downloaded Kubernetes binary release
 kubernetes/
 

diff --git a/cluster/juju/bundles/local.yaml b/cluster/juju/bundles/local.yaml
@@ -1,53 +1,18 @@
-kubernetes-local:
-  services:
-    kubernetes-master:
-      charm: local:trusty/kubernetes-master
-      annotations:
-        "gui-x": "600"
-        "gui-y": "0"
-      expose: true
-      options:
-        version: "local"
-    docker:
-      charm: cs:trusty/docker
-      num_units: 2
-      options:
-        latest: true
-      annotations:
-        "gui-x": "0"
-        "gui-y": "0"
-    flannel-docker:
-      charm: cs:~kubernetes/trusty/flannel-docker
-      annotations:
-        "gui-x": "0"
-        "gui-y": "300"
-    kubernetes:
-      charm: local:trusty/kubernetes
-      annotations:
-        "gui-x": "300"
-        "gui-y": "300"
-    etcd:
-      charm: cs:~kubernetes/trusty/etcd
-      annotations:
-        "gui-x": "300"
-        "gui-y": "0"
-  relations:
-    - - "flannel-docker:network"
-      - "docker:network"
-    - - "flannel-docker:network"
-      - "kubernetes-master:network"
-    - - "flannel-docker:docker-host"
-      - "docker:juju-info"
-    - - "flannel-docker:docker-host"
-      - "kubernetes-master:juju-info"
-    - - "flannel-docker:db"
-      - "etcd:client"
-    - - "kubernetes:docker-host"
-      - "docker:juju-info"
-    - - "etcd:client"
-      - "kubernetes:etcd"
-    - - "etcd:client"
-      - "kubernetes-master:etcd"
-    - - "kubernetes-master:minions-api"
-      - "kubernetes:api"
-  series: trusty
+services:
+  kubernetes:
+    charm: local:trusty/kubernetes
+    annotations:
+      "gui-x": "600"
+      "gui-y": "0"
+    expose: true
+    num_units: 2
+  etcd:
+    charm: cs:~containers/trusty/etcd
+    annotations:
+      "gui-x": "300"
+      "gui-y": "0"
+    num_units: 1
+relations:
+  - - "kubernetes:etcd"
+    - "etcd:db"
+series: trusty
diff --git a/cluster/juju/charms/trusty/.gitignore b/cluster/juju/charms/trusty/.gitignore
diff --git a/cluster/juju/charms/trusty/kubernetes-master/.bzrignore b/cluster/juju/charms/trusty/kubernetes-master/.bzrignore
diff --git a/cluster/juju/charms/trusty/kubernetes-master/.gitignore b/cluster/juju/charms/trusty/kubernetes-master/.gitignore
diff --git a/cluster/juju/charms/trusty/kubernetes-master/.vendor-rc b/cluster/juju/charms/trusty/kubernetes-master/.vendor-rc
diff --git a/cluster/juju/charms/trusty/kubernetes-master/Makefile b/cluster/juju/charms/trusty/kubernetes-master/Makefile
diff --git a/cluster/juju/charms/trusty/kubernetes-master/README.md b/cluster/juju/charms/trusty/kubernetes-master/README.md
diff --git a/cluster/juju/charms/trusty/kubernetes-master/config.yaml b/cluster/juju/charms/trusty/kubernetes-master/config.yaml
diff --git a/cluster/juju/charms/trusty/kubernetes-master/copyright b/cluster/juju/charms/trusty/kubernetes-master/copyright
diff --git a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
diff --git a/cluster/juju/charms/trusty/kubernetes-master/files/controller-manager.upstart.tmpl b/cluster/juju/charms/trusty/kubernetes-master/files/controller-manager.upstart.tmpl
diff --git a/cluster/juju/charms/trusty/kubernetes-master/files/distribution.conf.tmpl b/cluster/juju/charms/trusty/kubernetes-master/files/distribution.conf.tmpl
diff --git a/cluster/juju/charms/trusty/kubernetes-master/files/nginx.conf.tmpl b/cluster/juju/charms/trusty/kubernetes-master/files/nginx.conf.tmpl