k8s: Update k8s ref. arch

occopus · Apr 6, 2021 · ccc233b · ccc233b
1 parent a982c29
commit ccc233b
Show file tree

Hide file tree

Showing 9 changed files with 230 additions and 248 deletions.
diff --git a/sphinx/source/tutorial-building-clusters.rst b/sphinx/source/tutorial-building-clusters.rst
@@ -125,7 +125,7 @@ protocol (on port 6443).
 
 **Download**
 
-You can download the example as `tutorial.examples.kubernetes <https://raw.githubusercontent.com/occopus/docs/devel/tutorials/kubernetes.tar.gz>`_ .
+You can download the example as `tutorial.examples.kubernetes <https://raw.githubusercontent.com/occopus/docs/master/tutorials/kubernetes-cluster.tar.gz>`_ .
 
 **Steps**
 
@@ -249,12 +249,9 @@ The following steps are suggested to be performed:
       kubernetes-dashboard   dashboard-metrics-scraper-6b4884c9d5-w6rx6                                               1/1     Running   0          12m
       kubernetes-dashboard   kubernetes-dashboard-64794c64b8-sb9m6                                                    1/1     Running   0          12m
 
-   You can access Dashboard at ``https://[master_node_ip]:32000``.
+   You can access Dashboard at ``http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kubernetes-dashboard:/proxy/#/login``.
 
-   On the login page please choose the basic option and enter the following username and password:
-
-      - Username: admin
-      - Password: admin
+   On the login page please click on the SKIP button.
 
 #. Finally, you may destroy the infrastructure using the infrastructure id returned by ``occopus-build``
 
@@ -273,7 +270,7 @@ In this tutorial we establish a cluster with two nodes types. On the DataAvenue
 
  - creating two types of nodes through contextualisation
  - using the nova resource handler
- 
+
 **Prerequisites**
 
  - accessing an Occopus compatible interface

diff --git a/tutorials/kubernetes-cluster.tar.gz b/tutorials/kubernetes-cluster.tar.gz
diff --git a/...kubernetes/builtin_kubernetes_private_key → ...es-cluster/builtin_kubernetes_private_key b/...kubernetes/builtin_kubernetes_private_key → ...es-cluster/builtin_kubernetes_private_key
diff --git a/tutorials/kubernetes/infra-kubernetes.yaml → ...tes-cluster/infra-kubernetes-cluster.yaml b/tutorials/kubernetes/infra-kubernetes.yaml → ...tes-cluster/infra-kubernetes-cluster.yaml
@@ -9,15 +9,14 @@ nodes:
     name: kubernetes-slave
     type: kubernetes_slave_node
     scaling:
-      min: 2
+      min: 4
       max: 10
 variables:
-  helmversion: 2.16.9-linux-amd64
-  pythonversion: python3.7
-  kubernetesversion: 1.18.3-00
-  dockerversion: 5:19.03.11~3-0~ubuntu-bionic
-  flannelversion: v0.12.0
-  dashboardversion: v2.0.4
+  helmversion: 3.5.2-linux-amd64
+  kubernetesversion: 1.20.5-00
+  dockerversion: 5:19.03.15~3-0~ubuntu-bionic
+  flannelversion: v0.13.0
+  dashboardversion: v2.2.0
   kubemaster_private_key: |
     -----BEGIN RSA PRIVATE KEY-----
 
@@ -77,4 +76,3 @@ variables:
 dependencies:
   -
     connection: [ *S, *M ]
-