From 75f1da75844d32c98de8d713d51da3d849433fbc Mon Sep 17 00:00:00 2001
From: attardi <giuseppe.attardi@garr.it>
Date: Tue, 5 Mar 2019 19:06:26 +0100
Subject: [PATCH] Upgraded to CDK Canal 324.
---
bundle.yaml | 81 ++++++++++++++++++++++++++++++++---------------------
1 file changed, 49 insertions(+), 32 deletions(-)
diff --git a/bundle.yaml b/bundle.yaml
index cb10ce7..8cd01e2 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -5,8 +5,8 @@
# The worker nodes with GPUs should be tagged as 'gpu'.
##
-series: xenial
-description: An eight-machine Kubernetes cluster, appropriate for production. Includes a three-machine etcd and ceph-mon cluster, a Kubernetes master, three Kubernetes worker nodes and a Kubernetes worker with GPUs. The Ceph (Luminous) cluster uses three nodes for Ceph Monitors and a Ceph OSD in LXD containers on each worker machine. Two Ceph MDSs provide redundant shared Ceph File System.
+series: bionic
+description: A 9-machine Kubernetes cluster, appropriate for production. Includes a three-machine etcd and ceph-mon cluster, two Kubernetes masters, three Kubernetes worker nodes and a Kubernetes worker with GPUs. The Ceph (Luminous) cluster uses three nodes for Ceph Monitors and a Ceph OSD in LXD containers on each worker machine. Two Ceph MDSs provide redundant shared Ceph File System.
# ----------------------------------------------------------------------
machines:
@@ -29,11 +29,25 @@ services:
# ip route | grep default
gateway: 90.147.161.27/25
+ canal:
+ annotations:
+ gui-x: '450'
+ gui-y: '750'
+ charm: cs:~containers/canal-584
+ resources:
+ calico: 73
+ calico-arm64: 69
+ flannel: 73
+ flannel-arm64: 72
+
easyrsa:
- charm: cs:~containers/easyrsa-50
+ charm: cs:~containers/easyrsa-222
+ constraints: root-disk=8G
bindings:
"": space-os-mgmt
num_units: 1
+ resources:
+ easyrsa: 5
to:
# an lxd on the unit of kubernetes-master
- "lxd:kubernetes-master"
@@ -42,13 +56,17 @@ services:
gui-y: '550'
etcd:
- charm: cs:~containers/etcd-96
+ charm: cs:~containers/etcd-397
+ constraints: root-disk=8G
bindings:
"": space-os-mgmt
num_units: 3
# constraints: tags=kubernetes
options:
channel: 3.2/stable
+ resources:
+ etcd: 3
+ snapshot: 0
to:
- "lxd:0"
- "lxd:1"
@@ -57,23 +75,16 @@ services:
gui-x: '800'
gui-y: '550'
- flannel:
- charm: cs:~containers/flannel-66
- # no bindings
- options:
- cidr: 10.111.0.0/16
- annotations:
- gui-x: '450'
- gui-y: '750'
-
kubeapi-load-balancer:
- charm: cs:~containers/kubeapi-load-balancer-69
+ charm: cs:~containers/kubeapi-load-balancer-583
+ constraints: root-disk=8G
bindings:
"": space-os-mgmt
# necessary for getting a floating IP
apiserver: space-pub
expose: true
num_units: 1
+ resources: {}
to:
- "lxd:kubernetes-master"
annotations:
@@ -87,33 +98,40 @@ services:
k8s-keystone-auth-url: https://git.garr.it/cloud/charms/kubernetes-keystone/raw/master/bin/linux-amd64/k8s-keystone-auth
kubernetes-master:
- charm: cs:~containers/kubernetes-master-122
+ charm: cs:~containers/kubernetes-master-604
+ constraints: tags=kubernetes-public-ip cores=2 mem=4G root-disk=16G
bindings:
"": space-os-mgmt
#kube-api-endpoint: space-pub
- num_units: 1
- constraints: tags=kubernetes-public-ip cores=2 mem=4G #root-disk=16G
+ num_units: 2
options:
- channel: 1.11/stable
+ channel: 1.13/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
# the value must be false, rather than what the documentation says.
api-extra-args: "anonymous-auth=false"
enable-dashboard-addons: True
+ resources:
+ cdk-addons: 0
+ kube-apiserver: 0
+ kube-controller-manager: 0
+ kube-proxy: 0
+ kube-scheduler: 0
+ kubectl: 0
annotations:
gui-x: '800'
gui-y: '850'
kubernetes-worker:
- charm: cs:~containers/kubernetes-worker-138
+ charm: cs:~containers/kubernetes-worker-472
+ constraints: tags=kubernetes cores=4 mem=4G root-disk=16G
bindings:
"": space-os-mgmt
- num_units: 3
- constraints: tags=kubernetes cores=4 mem=4G #root-disk=16G
expose: true
+ num_units: 3
options:
- channel: 1.11/stable
+ channel: 1.13/stable
# Enable Cloud Controller Manager
# https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
# kubelet-extra-args: --cloud-provider=external
@@ -122,16 +140,15 @@ services:
gui-y: '850'
kubernetes-worker-gpu:
- charm: cs:~containers/kubernetes-worker-138
+ charm: cs:~containers/kubernetes-worker-472
bindings:
"": space-os-mgmt
- # charm: ./kubernetes-worker # patched for cuda-9.0
num_units: 1
- constraints: tags=gpu cores=4 mem=4G #root-disk=16G
+ constraints: tags=gpu cores=4 mem=4G root-disk=16G
expose: true
options:
- channel: 1.11/stable
- cuda_repo: 9.2.148-1
+ channel: 1.13/stable
+ cuda_repo: 10.0.130-1
# kubelet-extra-args: --cloud-provider=external
annotations:
gui-x: "520"
@@ -223,11 +240,11 @@ relations:
- ["kubernetes-master:kube-control", "kubernetes-worker-gpu:kube-control"]
- ["kubernetes-worker-gpu:certificates", "easyrsa:client"]
- ["kubernetes-worker-gpu:kube-api-endpoint", "kubeapi-load-balancer:website"]
- # Flannel
- - ["flannel:etcd", "etcd:db"]
- - ["flannel:cni", "kubernetes-master:cni"]
- - ["flannel:cni", "kubernetes-worker:cni"]
- - ["flannel:cni", "kubernetes-worker-gpu:cni"]
+ # Canal
+ - ["canal:etcd", "etcd:db"]
+ - ["canal:cni", "kubernetes-master:cni"]
+ - ["canal:cni", "kubernetes-worker:cni"]
+ - ["canal:cni", "kubernetes-worker-gpu:cni"]
# Ceph
- ["kubernetes-master:ceph-storage", "ceph-mon:admin"]
- ["ceph-osd:mon", "ceph-mon:osd"]
--
GitLab