github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8624 from chuckbutler/flannel-docker-namespace

Browse Source 
Repoint flannel-docker service to ~kubernetes namespace
This commit is contained in:
Dawn Chen 2015-05-22 14:33:58 -07:00
commit c2831fb047
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/juju/bundles/local.yaml
View File

@ -9,8 +9,7 @@ kubernetes-local:
options: options:
version: "v0.15.0" version: "v0.15.0"
docker: docker:
charm: docker charm: cs:trusty/docker
branch: https://github.com/chuckbutler/docker-charm.git
num_units: 2 num_units: 2
options: options:
latest: true latest: true
@ -18,8 +17,7 @@ kubernetes-local:
"gui-x": "0" "gui-x": "0"
"gui-y": "0" "gui-y": "0"
flannel-docker: flannel-docker:
charm: flannel-docker charm: cs:~kubernetes/trusty/flannel-docker
branch: https://github.com/chuckbutler/flannel-docker-charm.git
annotations: annotations:
"gui-x": "0" "gui-x": "0"
"gui-y": "300" "gui-y": "300"