From 143c9a05d4d593e4a7dee8493b5c63833bfc68ca Mon Sep 17 00:00:00 2001
From: attardi <giuseppe.attardi@garr.it>
Date: Thu, 12 Apr 2018 15:47:23 +0200
Subject: [PATCH] Upgrade to Kubernetes 1.10/stable.
---
bundle.yaml | 35 +++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/bundle.yaml b/bundle.yaml
index cffba29..55799fc 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -78,14 +78,14 @@ services:
gui-y: '250'
kubernetes-master:
- charm: cs:~containers/kubernetes-master-87
+ charm: cs:~containers/kubernetes-master-102
bindings:
"": space-os-mgmt
kube-api-endpoint: space-pub
num_units: 1
constraints: tags=kubernetes-public-ip
options:
- channel: 1.9/stable
+ channel: 1.10/stable
authorization-mode: Node,RBAC
# RBAC to allow access to dashboard to User "system:anonymous"
# Because of this bug https://github.com/kubernetes/kubernetes/issues/39722
@@ -97,14 +97,14 @@ services:
gui-y: '850'
kubernetes-worker:
- charm: cs:~containers/kubernetes-worker-90
+ charm: cs:~containers/kubernetes-worker-114
bindings:
"": space-os-mgmt
num_units: 3
constraints: cores=4 mem=4G tags=kubernetes
expose: true
options:
- channel: 1.9/stable
+ channel: 1.10/stable
cuda-version: 9.0.176-1
# Enable Cloud Controller Manager
# https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
@@ -114,7 +114,7 @@ services:
gui-y: '850'
kubernetes-worker-gpu:
- charm: cs:~containers/kubernetes-worker-90
+ charm: cs:~containers/kubernetes-worker-114
bindings:
"": space-os-mgmt
# charm: ./kubernetes-worker # patched for cuda-9.0
@@ -122,7 +122,7 @@ services:
constraints: cores=4 mem=4G tags=gpu
expose: true
options:
- channel: 1.9/stable
+ channel: 1.10/stable
cuda-version: 9.0.176-1
# kubelet-extra-args: --cloud-provider=external
annotations:
@@ -177,6 +177,24 @@ services:
gui-x: '1200'
gui-y: '400'
+ # manila:
+ # charm: cs:manila
+ # bindings:
+ # "": space-os-mgmt
+ # to:
+ # - 'lxd:2'
+ # options:
+ # debug: True
+
+ # manila-generic:
+ # charm: cs:manila-generic
+ # bindings:
+ # "": space-os-mgmt
+ # to:
+ # - 'lxd:2'
+ # options:
+ # debug: True
+
# ----------------------------------------------------------------------
relations:
- ["kubernetes-master:kube-api-endpoint", "kubeapi-load-balancer:apiserver"]
@@ -204,3 +222,8 @@ relations:
- ["kubernetes-master:ceph-storage", "ceph-mon:admin"]
- ["ceph-osd:mon", "ceph-mon:osd"]
- ["ceph-mds:ceph-mds", "ceph-mon:mds"]
+ # # Manila
+ # - [ manila, keystone ]
+ # - [ manila, manila-generic ]
+ # - [ neutron-openvswitch, manila ]
+
\ No newline at end of file
--
GitLab