From 6535aa660693adb8b4480a91ab85c85cbd35b64f Mon Sep 17 00:00:00 2001
From: Alberto Colla <alberto.colla@garr.it>
Date: Fri, 11 Oct 2019 10:57:26 +0000
Subject: [PATCH] bundle k8s staging
---
bundle_staging.yaml | 47 +++++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/bundle_staging.yaml b/bundle_staging.yaml
index 6d33d12..d71929a 100644
--- a/bundle_staging.yaml
+++ b/bundle_staging.yaml
@@ -13,6 +13,7 @@ parameters:
# Network
default-net: &default_net space-os-mgmt
data-net: &data_net space-os-data
+ ext-net: &ext_net space-pub
default-gw-ip: &default_gw_ip 90.147.154.1
# --------------------------------------------------------------------------------
@@ -43,7 +44,7 @@ services:
gateway: *default_gw_ip
easyrsa:
- charm: cs:~containers/easyrsa
+ charm: cs:~containers/easyrsa-222
constraints: root-disk=8G
bindings:
"": space-os-mgmt
@@ -57,31 +58,34 @@ services:
gui-x: '450'
gui-y: '550'
+ containerd:
+ charm: cs:~containers/containerd
+
etcd:
- charm: cs:~containers/etcd
+ charm: cs:~containers/etcd-378
bindings:
"": *default_net
num_units: 3
options:
channel: 3.2/stable
resources:
- core: 0
+ #core: 0
etcd: 3
snapshot: 0
to:
+ - "lxd:0"
- "lxd:1"
- "lxd:2"
- - "lxd:3"
annotations:
gui-x: '800'
gui-y: '550'
flannel:
- charm: cs:~containers/flannel
+ charm: cs:~containers/flannel-386
resources:
- flannel-amd64: 302
- flannel-arm64: 298
- flannel-s390x: 285
+ flannel-amd64: 76
+ flannel-arm64: 76
+ flannel-s390x: 62
# no bindings
options:
cidr: 10.111.0.0/16
@@ -101,11 +105,11 @@ services:
# gui-y: '750'
kubeapi-load-balancer:
- charm: cs:~containers/kubeapi-load-balancer
+ charm: cs:~containers/kubeapi-load-balancer-628
bindings:
- "": space-os-mgmt
+ "": *default_net
# necessary for getting a floating IP
- apiserver: space-pub
+ apiserver: *ext_net
expose: true
num_units: 1
resources: {}
@@ -122,14 +126,11 @@ 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
+ charm: cs:~containers/kubernetes-master-542
constraints: tags=kubernetes-master
- bindings:
- "": space-os-mgmt
- #kube-api-endpoint: space-pub
num_units: 1
options:
- channel: 1.15/stable
+ channel: 1.13/stable
authorization-mode: "Node,RBAC,Webhook"
# RBAC to allow access to dashboard to User "system:anonymous"
# Because of this bug https://github.com/kubernetes/kubernetes/issues/39722
@@ -138,7 +139,7 @@ services:
enable-dashboard-addons: True
resources:
cdk-addons: 0
- core: 0
+ #core: 0
kube-apiserver: 0
kube-controller-manager: 0
kube-proxy: 0
@@ -151,14 +152,16 @@ services:
- "0"
kubernetes-worker:
- charm: cs:~containers/kubernetes-worker
+ charm: cs:~containers/kubernetes-worker-472
constraints: tags=kubernetes-worker cores=4 mem=4G root-disk=16G
- bindings:
- "": space-os-mgmt
expose: true
num_units: 3
+ resources:
+ cni-amd64: 82
+ cni-arm64: 76
+ cni-s390x: 80
options:
- channel: 1.14/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
@@ -200,6 +203,8 @@ relations:
- ["kubernetes-master:kube-control", "kubernetes-worker:kube-control"]
- ["kubernetes-worker:certificates", "easyrsa:client"]
- ["kubernetes-worker:kube-api-endpoint", "kubeapi-load-balancer:website"]
+ #- ["kubernetes-worker:container-runtime", "containerd:containerd"]
+ #- ["kubernetes-master:container-runtime", "containerd:containerd"]
# K8s worker GPU
# - ["kubernetes-master:kube-control", "kubernetes-worker-gpu:kube-control"]
# - ["kubernetes-worker-gpu:certificates", "easyrsa:client"]
--
GitLab