From d768cb42bee34af665a6647e31f9bf6457c2d70b Mon Sep 17 00:00:00 2001
From: attardi <giuseppe.attardi@garr.it>
Date: Fri, 26 Jan 2018 16:03:13 +0100
Subject: [PATCH] Fully working version.
---
README.md | 2 +-
bundle-config.yaml | 4 ----
bundle.yaml | 22 ++++++++--------------
3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 76cab0d..baee817 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ $ kubectl get nodes
The `Kubernetes` dashboard addon is installed by default, along with `Heapster`,
`Grafana` and `InfluxDB` for cluster monitoring. The dashboard addons can be
-enabled or disabled by setting the `enable-dashboard-addons` config on the
+enabled (default) or disabled by setting the `enable-dashboard-addons` config on the
`kubernetes-master` application:
```sh
diff --git a/bundle-config.yaml b/bundle-config.yaml
index 3a731f8..35769d1 100644
--- a/bundle-config.yaml
+++ b/bundle-config.yaml
@@ -5,10 +5,6 @@
# --------------------------------------------------------------------------------
parameters:
- # Constraints
- public-ip: &public_ip "public-ip"
- cluster: &cluster "kubernetes"
-
# Network
default-net: &default_net space-os-mgmt
data-net: &data_net space-os-data
diff --git a/bundle.yaml b/bundle.yaml
index a91d229..8794877 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -40,13 +40,12 @@ services:
options:
# ip route | grep default
gateway: 90.147.161.1/25
-
+
easyrsa:
annotations:
gui-x: '450'
gui-y: '550'
- charm: cs:~containers/easyrsa
- # charm: cs:~containers/easyrsa-27
+ charm: cs:~containers/easyrsa-27
num_units: 1
bindings:
"": space-os-mgmt
@@ -57,8 +56,7 @@ services:
annotations:
gui-x: '800'
gui-y: '550'
- charm: cs:~containers/etcd
- # charm: cs:~containers/etcd-63
+ charm: cs:~containers/etcd-63
num_units: 3
# constraints: tags=kubernetes
bindings:
@@ -72,7 +70,7 @@ services:
annotations:
gui-x: '450'
gui-y: '750'
- charm: cs:~containers/flannel
+ charm: cs:~containers/flannel-40
bindings:
"": space-os-mgmt
@@ -80,10 +78,9 @@ services:
annotations:
gui-x: '450'
gui-y: '250'
- charm: cs:~containers/kubeapi-load-balancer
+ charm: cs:~containers/kubeapi-load-balancer-43
expose: true
num_units: 1
- # constraints: tags=kubernetes
bindings:
"": space-os-mgmt
to:
@@ -93,14 +90,13 @@ services:
annotations:
gui-x: '800'
gui-y: '850'
- charm: cs:~containers/kubernetes-master
- # charm: cs:~containers/kubernetes-master-78
+ charm: cs:~containers/kubernetes-master-78
# charm: "cs:~tvansteenburgh/kubernetes-master"
num_units: 1
# constraints: tags=kubernetes,public-ip
options:
channel: 1.9/stable
- authorization-mode: Node,RBAC
+ # authorization-mode: Node,RBAC
enable-dashboard-addons: True
to:
- "3"
@@ -109,8 +105,7 @@ services:
annotations:
gui-x: '100'
gui-y: '850'
- charm: cs:~containers/kubernetes-worker
- # charm: cs:~containers/kubernetes-worker-81
+ charm: cs:~containers/kubernetes-worker-81
expose: true
num_units: 3
# constraints: cores=4 mem=4G tags=kubernetes
@@ -204,4 +199,3 @@ relations:
- ["kubernetes-master:ceph-storage", "ceph-mon:admin"]
- ["ceph-osd:mon", "ceph-mon:osd"]
- ["ceph-mds:ceph-mds", "ceph-mon:mds"]
-
--
GitLab