From cc94ba173e9eb087e512de6c1c838eaafa7009af Mon Sep 17 00:00:00 2001
From: Marica Antonacci <marica.antonacci@ba.infn.it>
Date: Tue, 30 Aug 2022 09:28:51 +0200
Subject: [PATCH 01/36] Update k8s to 1.23.8
---
kubernetes/k8s_cluster.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 721ba3b..2c5ccd5 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -1,9 +1,9 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/infrastructure/kubernetes_types.yaml
-description: Deploy a single master Kubernetes 1.19.6 cluster
+description: Deploy a single master Kubernetes 1.23.8 cluster
topology_template:
@@ -105,7 +105,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.19.6
+ kube_version: 1.23.8
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -113,7 +113,7 @@ topology_template:
k8s_node:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.19.6
+ kube_version: 1.23.8
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_node_server
--
GitLab
From ec280c012a247034c079f8029d2b2988268c0058 Mon Sep 17 00:00:00 2001
From: Marica Antonacci <marica.antonacci@ba.infn.it>
Date: Fri, 23 Sep 2022 09:21:43 +0200
Subject: [PATCH 02/36] Update ek version
---
single-vm/elasticsearch_kibana.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/single-vm/elasticsearch_kibana.yaml b/single-vm/elasticsearch_kibana.yaml
index ef8e59d..e8598c0 100644
--- a/single-vm/elasticsearch_kibana.yaml
+++ b/single-vm/elasticsearch_kibana.yaml
@@ -7,7 +7,7 @@ description: >
Deploy a virtual machine pre-configured with the Elasticsearch search and analytics engine and with Kibana for simple visualization of data with charts and graphs in Elasticsearch
metadata:
- display_name: Elasticsearch and Kibana (version 8.1.3)
+ display_name: Elasticsearch and Kibana (version 8.4.1)
topology_template:
@@ -96,7 +96,7 @@ topology_template:
properties:
project_name: elastic
environment_variables:
- - ELASTIC_VERSION: "8.1.3"
+ - ELASTIC_VERSION: "8.4.1"
- ELASTIC_PASSWORD: { get_input: elastic_password }
- KIBANA_PASSWORD: { get_input: kibana_password }
- CERT_EMAIL: { get_input: contact_email }
--
GitLab
From 01680317238b8b3542e1c68388f51dea45dd391c Mon Sep 17 00:00:00 2001
From: Marica Antonacci <marica.antonacci@ba.infn.it>
Date: Fri, 30 Sep 2022 09:01:08 +0200
Subject: [PATCH 03/36] Update k8s version
---
kubernetes/htcondor_k8s.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index bddcd8c..3cc0948 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/applications/htcondor_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/applications/htcondor_types.yaml
description: Deploy a complete HTCondor 8.9.9 cluster
@@ -307,7 +307,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.19.6
+ kube_version: 1.23.8
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -315,7 +315,7 @@ topology_template:
k8s_slave:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.19.6
+ kube_version: 1.23.8
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_slave_server
--
GitLab
From eee8f0069d3dd2ac9edec4c3f0c8bd625b6b1d63 Mon Sep 17 00:00:00 2001
From: Marica Antonacci <marica.antonacci@ba.infn.it>
Date: Mon, 3 Oct 2022 14:51:42 +0200
Subject: [PATCH 04/36] Use k8s 1.23.8
---
kubernetes/spark_cluster.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index d6a2f29..e6d238d 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/applications/spark_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/applications/spark_types.yaml
description: Deploy a complete Spark 3.0.1 + Jupyter Notebook on top of a Kubernetes (K8s) computing cluster
@@ -127,7 +127,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.19.6
+ kube_version: 1.23.8
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -135,7 +135,7 @@ topology_template:
k8s_slave:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.19.6
+ kube_version: 1.23.8
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_slave_server
--
GitLab
From e918940f3b82f4f31a49a5427e7ce6b654302f18 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Wed, 2 Nov 2022 14:56:05 +0100
Subject: [PATCH 05/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 2c5ccd5..bb00af4 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -3,10 +3,11 @@ tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/infrastructure/kubernetes_types.yaml
-description: Deploy a single master Kubernetes 1.23.8 cluster
+description: Deploy a single master Kubernetes 1.24.7 cluster
topology_template:
+
inputs:
admin_token:
@@ -65,6 +66,7 @@ topology_template:
default: []
required: false
+
node_templates:
pub_network:
@@ -101,11 +103,10 @@ topology_template:
- binding: k8s_node_server
- link: priv_network
-
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.23.8
+ kube_version: 1.24.7
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -113,7 +114,7 @@ topology_template:
k8s_node:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.23.8
+ kube_version: 1.24.7
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_node_server
--
GitLab
From d2e796c0f0b2a77b24979be1da8422405d71551b Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Fri, 4 Nov 2022 15:37:29 +0100
Subject: [PATCH 06/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index bb00af4..dd4f188 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.24.7 cluster
--
GitLab
From 89a24691b3cf2aea2918b1d99aa3fa05022b8f4c Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Fri, 4 Nov 2022 15:55:57 +0100
Subject: [PATCH 07/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index dd4f188..5c3c2d1 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -172,4 +172,11 @@ topology_template:
k8s_node_ip:
value: { get_attribute: [ k8s_node_server, private_address ] }
os_users:
- value: { get_property: [ k8s_master_server, os_users, 0 ] }
+ value: { get_property: [ k8s_master_server, os_users, 0 ] }
+
+
+ policies:
+ - deploy_on_specific_site:
+ type: tosca.policies.indigo.SlaPlacement
+ properties:
+ sla_id: ee1114a1-7ab6-46d2-8146-c5095f8f442d
--
GitLab
From 4ed4e0332c8e1dec9456452ad0d21ba76e771585 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Fri, 4 Nov 2022 16:36:10 +0100
Subject: [PATCH 08/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 5c3c2d1..2a5cff9 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -179,4 +179,4 @@ topology_template:
- deploy_on_specific_site:
type: tosca.policies.indigo.SlaPlacement
properties:
- sla_id: ee1114a1-7ab6-46d2-8146-c5095f8f442d
+ sla_id: b9233b5d-2882-4c54-a35d-3ded5309c3ed
--
GitLab
From 7cb93b88ae371aaf261d2d54ddb1232fbd5bda31 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Fri, 4 Nov 2022 16:37:19 +0100
Subject: [PATCH 09/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 2a5cff9..a60456f 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -175,8 +175,8 @@ topology_template:
value: { get_property: [ k8s_master_server, os_users, 0 ] }
- policies:
- - deploy_on_specific_site:
- type: tosca.policies.indigo.SlaPlacement
- properties:
- sla_id: b9233b5d-2882-4c54-a35d-3ded5309c3ed
+ # policies:
+ # - deploy_on_specific_site:
+ # type: tosca.policies.indigo.SlaPlacement
+ # properties:
+ # sla_id: b9233b5d-2882-4c54-a35d-3ded5309c3ed
--
GitLab
From 81992534ac846475e41b63c3b2f09150db375830 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Mon, 7 Nov 2022 17:29:22 +0100
Subject: [PATCH 10/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index a60456f..dc96d6a 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -25,12 +25,12 @@ topology_template:
num_cpus_master:
description: number of CPU for K8s master VM
type: integer
- default: 4
+ default: 2
mem_size_master:
description: memory size for K8s master VM
type: string
- default: "8 GB"
+ default: "4 GB"
number_of_nodes:
description: number of K8s node VMs
@@ -40,12 +40,12 @@ topology_template:
num_cpus_node:
description: number of CPUs for K8s node VM
type: integer
- default: 4
+ default: 2
mem_size_node:
description: memory size for K8s node VM
type: string
- default: "8 GB"
+ default: "4 GB"
ports:
description:
--
GitLab
From e6a80a36ec303d14eca0c5d50c0a5e54b3f5b07d Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Mon, 7 Nov 2022 18:05:53 +0100
Subject: [PATCH 11/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index dc96d6a..fcb488e 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -25,7 +25,7 @@ topology_template:
num_cpus_master:
description: number of CPU for K8s master VM
type: integer
- default: 2
+ default: 1
mem_size_master:
description: memory size for K8s master VM
@@ -40,7 +40,7 @@ topology_template:
num_cpus_node:
description: number of CPUs for K8s node VM
type: integer
- default: 2
+ default: 1
mem_size_node:
description: memory size for K8s node VM
--
GitLab
From ce4c1c173bddb68160df4543a20c38ca27473abb Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Mon, 7 Nov 2022 18:18:27 +0100
Subject: [PATCH 12/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index fcb488e..dc96d6a 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -25,7 +25,7 @@ topology_template:
num_cpus_master:
description: number of CPU for K8s master VM
type: integer
- default: 1
+ default: 2
mem_size_master:
description: memory size for K8s master VM
@@ -40,7 +40,7 @@ topology_template:
num_cpus_node:
description: number of CPUs for K8s node VM
type: integer
- default: 1
+ default: 2
mem_size_node:
description: memory size for K8s node VM
--
GitLab
From b4f231b61425801b41f50fd728bda7ee49c4d785 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Mon, 7 Nov 2022 18:57:09 +0100
Subject: [PATCH 13/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index dc96d6a..0c30f53 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -175,8 +175,8 @@ topology_template:
value: { get_property: [ k8s_master_server, os_users, 0 ] }
- # policies:
- # - deploy_on_specific_site:
- # type: tosca.policies.indigo.SlaPlacement
- # properties:
- # sla_id: b9233b5d-2882-4c54-a35d-3ded5309c3ed
+ policies:
+ - deploy_on_specific_site:
+ type: tosca.policies.indigo.SlaPlacement
+ properties:
+ sla_id: ee1114a1-7ab6-46d2-8146-c5095f8f442d
--
GitLab
From 448d9631040c0b955c69d860898d983a574dee96 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Mon, 7 Nov 2022 19:06:45 +0100
Subject: [PATCH 14/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 0c30f53..aa9944c 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -174,9 +174,3 @@ topology_template:
os_users:
value: { get_property: [ k8s_master_server, os_users, 0 ] }
-
- policies:
- - deploy_on_specific_site:
- type: tosca.policies.indigo.SlaPlacement
- properties:
- sla_id: ee1114a1-7ab6-46d2-8146-c5095f8f442d
--
GitLab
From cc9be8402e55d9f93c031d6831d3234b19deb049 Mon Sep 17 00:00:00 2001
From: fsinisi <zinus92@DESKTOP-OKNP0UE.localdomain>
Date: Tue, 8 Nov 2022 11:06:52 +0100
Subject: [PATCH 15/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index aa9944c..d3f2248 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -173,4 +173,3 @@ topology_template:
value: { get_attribute: [ k8s_node_server, private_address ] }
os_users:
value: { get_property: [ k8s_master_server, os_users, 0 ] }
-
--
GitLab
From d2eafb31c57407c218ce08054de8a914907449d6 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 16 Nov 2022 16:28:57 +0100
Subject: [PATCH 16/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index d3f2248..1dfcb1c 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -162,7 +162,7 @@ topology_template:
outputs:
k8s_endpoint:
- value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
+ value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
grafana_endpoint:
value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
grafana_username:
--
GitLab
From cb7a4d30d02abbb0c5a0a20a7329ce4a350f8a45 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 16 Nov 2022 16:57:23 +0100
Subject: [PATCH 17/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 1dfcb1c..9ff356b 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -47,6 +47,11 @@ topology_template:
type: string
default: "4 GB"
+ domain:
+ description: cloud domain
+ type: string
+ default: ".myip.cloud.infn.it"
+
ports:
description:
type: map
@@ -134,7 +139,6 @@ topology_template:
count: { get_input: number_of_masters }
host:
properties:
- #instance_type: m1.medium
num_cpus: { get_input: num_cpus_master }
mem_size: { get_input: mem_size_master }
os:
@@ -162,9 +166,9 @@ topology_template:
outputs:
k8s_endpoint:
- value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
+ value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], get_input: domain ] }
grafana_endpoint:
- value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
+ value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], get_input: domain ] }
grafana_username:
value: admin
k8s_master_ip:
--
GitLab
From 9c734bf4392b2a4c732cbcaf88a47af3aa698092 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 16 Nov 2022 18:31:49 +0100
Subject: [PATCH 18/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 9ff356b..4d45e79 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -50,7 +50,7 @@ topology_template:
domain:
description: cloud domain
type: string
- default: ".myip.cloud.infn.it"
+ default: "myip.cloud.infn.it"
ports:
description:
@@ -166,7 +166,7 @@ topology_template:
outputs:
k8s_endpoint:
- value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], get_input: domain ] }
+ value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], '.', get_input: domain ] }
grafana_endpoint:
value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], get_input: domain ] }
grafana_username:
--
GitLab
From 7ed4423eaa1b790ecb026ed28bcd757323118fdc Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 16 Nov 2022 19:27:49 +0100
Subject: [PATCH 19/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 4d45e79..08a06ff 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -168,7 +168,7 @@ topology_template:
k8s_endpoint:
value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], '.', get_input: domain ] }
grafana_endpoint:
- value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], get_input: domain ] }
+ value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], '.', get_input: domain ] }
grafana_username:
value: admin
k8s_master_ip:
--
GitLab
From 7b7be008d8254b1e236dd070e032e4cdbd854353 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Tue, 22 Nov 2022 10:57:52 +0100
Subject: [PATCH 20/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 08a06ff..cf53367 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.24.7 cluster
--
GitLab
From b79d36fae436b39e98b0d4661ccb5e951f1ebeba Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Tue, 22 Nov 2022 11:40:54 +0100
Subject: [PATCH 21/36] implementations for k8s 1.24
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index cf53367..08a06ff 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.24.7 cluster
--
GitLab
From 36d00da31bda1c0ae24889aa101c4a5674ff68fd Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Fri, 9 Dec 2022 15:29:59 +0100
Subject: [PATCH 22/36] Update k8s_cluster.yaml
---
kubernetes/k8s_cluster.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 08a06ff..dca1c25 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/infrastructure/kubernetes_types.yaml
-description: Deploy a single master Kubernetes 1.24.7 cluster
+description: Deploy a single master Kubernetes 1.24.8 cluster
topology_template:
@@ -111,7 +111,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.24.7
+ kube_version: 1.24.8
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -119,7 +119,7 @@ topology_template:
k8s_node:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.24.7
+ kube_version: 1.24.8
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_node_server
--
GitLab
From 89e65042b0109cada84edff37aaaae1de1bcbd60 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Tue, 20 Dec 2022 15:56:34 +0100
Subject: [PATCH 23/36] aggiunto k8s 1.24.9
---
kubernetes/k8s_cluster.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index dca1c25..e3008ad 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/infrastructure/kubernetes_types.yaml
-description: Deploy a single master Kubernetes 1.24.8 cluster
+description: Deploy a single master Kubernetes 1.24.9 cluster
topology_template:
@@ -111,7 +111,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.24.8
+ kube_version: 1.24.9
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -119,7 +119,7 @@ topology_template:
k8s_node:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.24.8
+ kube_version: 1.24.9
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_node_server
--
GitLab
From b5ce790e934b4e1bfc6f1543567ebf2c3c5c9a51 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Mon, 9 Jan 2023 11:18:05 +0100
Subject: [PATCH 24/36] htc e spark con k8s 1.24
---
kubernetes/htcondor_k8s.yaml | 2 +-
kubernetes/spark_cluster.yaml | 39 +++++++++++++++++++++++++++++++----
2 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index 3cc0948..6c3e19b 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/applications/htcondor_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/applications/htcondor_types.yaml
description: Deploy a complete HTCondor 8.9.9 cluster
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index e6d238d..3a94f69 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/CLOUD-1394/tosca_types/applications/spark_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/k8s_1_24/tosca_types/applications/spark_types.yaml
description: Deploy a complete Spark 3.0.1 + Jupyter Notebook on top of a Kubernetes (K8s) computing cluster
@@ -11,6 +11,7 @@ metadata:
topology_template:
+
inputs:
admin_token:
@@ -49,11 +50,31 @@ topology_template:
description: memory size for K8s node VM
type: string
default: "8 GB"
-
+
+ iam_url:
+ type: string
+ default: "https://iam.cloud.infn.it"
+ description: IAM Instance for end user authentication
+
+ iam_subject:
+ type: string
+ default: ""
+ description: IAM owner subject
+
+ iam_groups:
+ type: string
+ default: ""
+ description: IAM groups for authorization management
+
+ iam_admin_groups:
+ type: string
+ default: ""
+ description: IAM groups for JupyterHub ADMIN authorization management
+
s3_bucket:
type: string
description: S3 bucket
-
+
s3_endpoint:
type: string
description: "S3 endpoint (http://endpoint:9000)"
@@ -67,6 +88,7 @@ topology_template:
default: []
required: false
+
node_templates:
pub_network:
@@ -111,6 +133,10 @@ topology_template:
repos:
- { name: dodas, url: "https://dodas-ts.github.io/helm_charts" }
externalIp: { get_attribute: [ k8s_master_server , public_address, 0 ] }
+ iam_url: { get_input: iam_url }
+ iam_subject: { get_input: iam_subject }
+ iam_groups: { get_input: iam_groups }
+ iam_admin_groups: { get_input: iam_admin_groups }
s3_bucket: { get_input: s3_bucket }
s3_endpoint : { get_input: s3_endpoint }
helm_version: v3
@@ -120,6 +146,11 @@ topology_template:
s3:
bucket: {{ s3_bucket }}
endpoint: {{ s3_endpoint }}
+ iam:
+ endpoint: {{ iam_endpoint }}
+ oauth_sub: {{ iam_subject }}
+ oauth_groups: {{ iam_groups }}
+ oauth_admin_groups: {{ iam_admin_groups }}
requirements:
- host: k8s_master_server
- dependency: k8s_master
@@ -204,4 +235,4 @@ topology_template:
grafana_endpoint:
value: { concat: [ 'https://grafana.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
os_users:
- value: { get_property: [ k8s_master_server, os_users, 0 ] }
+ value: { get_property: [ k8s_master_server, os_users, 0 ] }
--
GitLab
From ff915397209e104283afc4164ee771c12ded9837 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Mon, 9 Jan 2023 11:21:07 +0100
Subject: [PATCH 25/36] k8s 1.24
---
kubernetes/htcondor_k8s.yaml | 4 ++--
kubernetes/spark_cluster.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index 6c3e19b..d0be1a2 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -307,7 +307,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.23.8
+ kube_version: 1.24.9
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -315,7 +315,7 @@ topology_template:
k8s_slave:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.23.8
+ kube_version: 1.24.9
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_slave_server
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 3a94f69..7d5d2b7 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -158,7 +158,7 @@ topology_template:
k8s_master:
type: tosca.nodes.DODAS.FrontEnd.Kubernetes
properties:
- kube_version: 1.23.8
+ kube_version: 1.24.9
admin_token: { get_input: admin_token }
requirements:
- host: k8s_master_server
@@ -166,7 +166,7 @@ topology_template:
k8s_slave:
type: tosca.nodes.DODAS.WorkerNode.Kubernetes
properties:
- kube_version: 1.23.8
+ kube_version: 1.24.9
front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
requirements:
- host: k8s_slave_server
--
GitLab
From c9cb6cf8daa34e24d08d692a72fe48a59d06eb66 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Thu, 12 Jan 2023 11:07:55 +0100
Subject: [PATCH 26/36] aggiornato versione longhorn
---
kubernetes/htcondor_k8s.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index d0be1a2..8466229 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -122,7 +122,7 @@ topology_template:
- { name: longhorn, url: "https://charts.longhorn.io" }
name: longhorn
chart: "longhorn/longhorn"
- inline_options: "--version 1.2.2 -n longhorn-system --create-namespace"
+ inline_options: "--version 1.4.0 -n longhorn-system --create-namespace"
helm_version: v3
values_file: |
persistence:
--
GitLab
From d2f734328c50791112c56d7fb580fa9644d795f7 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Thu, 12 Jan 2023 17:02:51 +0100
Subject: [PATCH 27/36] aggiornato versione longhorn
---
kubernetes/private-net/htcondor_k8s.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/private-net/htcondor_k8s.yaml b/kubernetes/private-net/htcondor_k8s.yaml
index 8afe6bc..7ad70c9 100644
--- a/kubernetes/private-net/htcondor_k8s.yaml
+++ b/kubernetes/private-net/htcondor_k8s.yaml
@@ -109,7 +109,7 @@ topology_template:
- { name: longhorn, url: "https://charts.longhorn.io" }
name: longhorn
chart: "longhorn/longhorn"
- inline_options: "--version 1.2.2 -n longhorn-system --create-namespace"
+ inline_options: "--version 1.4.0 -n longhorn-system --create-namespace"
helm_version: v3
values_file: |
persistence:
--
GitLab
From 7aba5073a30e94c5cfeddf23a390eb3f56b76c55 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Fri, 13 Jan 2023 12:25:47 +0100
Subject: [PATCH 28/36] aggiornato versione longhorn
---
kubernetes/htcondor_k8s.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index 8466229..51d0927 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -122,7 +122,7 @@ topology_template:
- { name: longhorn, url: "https://charts.longhorn.io" }
name: longhorn
chart: "longhorn/longhorn"
- inline_options: "--version 1.4.0 -n longhorn-system --create-namespace"
+ inline_options: "--version 1.3.2 -n longhorn-system --create-namespace"
helm_version: v3
values_file: |
persistence:
@@ -299,7 +299,6 @@ topology_template:
iamScimClientId:
iamScimSecret:
iamMapGroup: ALL
-
requirements:
- host: k8s_master_server
- dependency: longhorn
--
GitLab
From 5355cafad9d47adf35d7082ba866803cd1583b85 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Tue, 24 Jan 2023 12:24:12 +0100
Subject: [PATCH 29/36] aggiunto volumi spark
---
kubernetes/spark_cluster.yaml | 45 +++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 7d5d2b7..ad17694 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -88,6 +88,26 @@ topology_template:
default: []
required: false
+ mountpoint_docker:
+ type: string
+ default: /var/lib/docker/
+ description: Path to mount the volume for docker
+
+ mountpoint_data:
+ type: string
+ default: /data
+ description: Path to mount the volume for data
+
+ volume_size_docker:
+ type: scalar-unit.size
+ description: Size of the volume to be attached
+ default: 20 GB
+
+ volume_size_data:
+ type: scalar-unit.size
+ description: Size of the volume to be attached
+ default: 20 GB
+
node_templates:
@@ -215,6 +235,31 @@ topology_template:
properties:
distribution: ubuntu
version: 20.04
+ requirements:
+ - local_storage:
+ node: block_device_docker
+ capability: tosca.capabilities.Attachment
+ relationship:
+ type: tosca.relationships.AttachesTo
+ properties:
+ location: { get_input: mountpoint_docker }
+ - local_storage:
+ node: block_device_data
+ capability: tosca.capabilities.Attachment
+ relationship:
+ type: tosca.relationships.AttachesTo
+ properties:
+ location: { get_input: mountpoint_data }
+
+ block_device_docker:
+ type: tosca.nodes.BlockStorage
+ properties:
+ size: { get_input: volume_size_docker }
+
+ block_device_data:
+ type: tosca.nodes.BlockStorage
+ properties:
+ size: { get_input: volume_size_data }
outputs:
--
GitLab
From 310d324b052a4fa6a37fd46593c918a620671ec0 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 25 Jan 2023 12:58:27 +0100
Subject: [PATCH 30/36] rimosso volumi spark
---
kubernetes/spark_cluster.yaml | 45 -----------------------------------
1 file changed, 45 deletions(-)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index ad17694..7d5d2b7 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -88,26 +88,6 @@ topology_template:
default: []
required: false
- mountpoint_docker:
- type: string
- default: /var/lib/docker/
- description: Path to mount the volume for docker
-
- mountpoint_data:
- type: string
- default: /data
- description: Path to mount the volume for data
-
- volume_size_docker:
- type: scalar-unit.size
- description: Size of the volume to be attached
- default: 20 GB
-
- volume_size_data:
- type: scalar-unit.size
- description: Size of the volume to be attached
- default: 20 GB
-
node_templates:
@@ -235,31 +215,6 @@ topology_template:
properties:
distribution: ubuntu
version: 20.04
- requirements:
- - local_storage:
- node: block_device_docker
- capability: tosca.capabilities.Attachment
- relationship:
- type: tosca.relationships.AttachesTo
- properties:
- location: { get_input: mountpoint_docker }
- - local_storage:
- node: block_device_data
- capability: tosca.capabilities.Attachment
- relationship:
- type: tosca.relationships.AttachesTo
- properties:
- location: { get_input: mountpoint_data }
-
- block_device_docker:
- type: tosca.nodes.BlockStorage
- properties:
- size: { get_input: volume_size_docker }
-
- block_device_data:
- type: tosca.nodes.BlockStorage
- properties:
- size: { get_input: volume_size_data }
outputs:
--
GitLab
From 0d19d622d309ee154a99ebc98394219a78ddde55 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 25 Jan 2023 14:59:10 +0100
Subject: [PATCH 31/36] cambiato flavor worker
---
kubernetes/spark_cluster.yaml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 7d5d2b7..7c32f6a 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -50,6 +50,11 @@ topology_template:
description: memory size for K8s node VM
type: string
default: "8 GB"
+
+ disk_size:
+ description: Size of the local disk available to applications running on the VM
+ type: scalar-unit.size
+ default: 40 GB
iam_url:
type: string
@@ -210,7 +215,8 @@ topology_template:
host:
properties:
num_cpus: { get_input: num_cpus_slave }
- mem_size: { get_input: mem_size_slave }
+ mem_size: { get_input: mem_size_slave }
+ disk_size: { get_input: disk_size }
os:
properties:
distribution: ubuntu
--
GitLab
From 9ad365a50b1f3f1b9512e1b20e78ddbe6108aacc Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 15 Feb 2023 16:05:41 +0100
Subject: [PATCH 32/36] correzione bug volume
---
kubernetes/spark_cluster.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 7c32f6a..2f354cf 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -56,6 +56,11 @@ topology_template:
type: scalar-unit.size
default: 40 GB
+ disk_type:
+ description: Verifichiamo se e' necessario questo parametro per creare VM da disco locale
+ type: string
+ default: "ephemeral"
+
iam_url:
type: string
default: "https://iam.cloud.infn.it"
--
GitLab
From 064e9552b2b29916069ae7856d165ac84206d52b Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 15 Feb 2023 16:11:45 +0100
Subject: [PATCH 33/36] correzione bug volume
---
kubernetes/spark_cluster.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 2f354cf..7d53211 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -222,6 +222,7 @@ topology_template:
num_cpus: { get_input: num_cpus_slave }
mem_size: { get_input: mem_size_slave }
disk_size: { get_input: disk_size }
+ disk_type: { get_input: disk_type }
os:
properties:
distribution: ubuntu
--
GitLab
From b78ce529b21a3582463e0a4935cacb365f5febb5 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Wed, 15 Feb 2023 17:16:57 +0100
Subject: [PATCH 34/36] errore volume spark
---
kubernetes/spark_cluster.yaml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 7d53211..7c32f6a 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -56,11 +56,6 @@ topology_template:
type: scalar-unit.size
default: 40 GB
- disk_type:
- description: Verifichiamo se e' necessario questo parametro per creare VM da disco locale
- type: string
- default: "ephemeral"
-
iam_url:
type: string
default: "https://iam.cloud.infn.it"
@@ -222,7 +217,6 @@ topology_template:
num_cpus: { get_input: num_cpus_slave }
mem_size: { get_input: mem_size_slave }
disk_size: { get_input: disk_size }
- disk_type: { get_input: disk_type }
os:
properties:
distribution: ubuntu
--
GitLab
From 06400f9abce5b64f1a0bc1c369811ecde41b9f9f Mon Sep 17 00:00:00 2001
From: Marica Antonacci <marica.antonacci@ba.infn.it>
Date: Thu, 16 Feb 2023 11:28:21 +0100
Subject: [PATCH 35/36] Restore template previous version for testing
---
kubernetes/k8s_cluster.yaml | 76 -------------------------------------
1 file changed, 76 deletions(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index cc62fdf..3a9a244 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -52,48 +52,6 @@ topology_template:
type: string
default: "myip.cloud.infn.it"
- disk_size_node:
- description: Size of the local disk on K8s node VMs
- type: scalar-unit.size
-
- number_of_nodes_with_gpu:
- description: Number of K8s nodes with GPU support
- type: integer
- default: 0
-
- num_cpus_node_with_gpu:
- description: Number of CPUs of K8s nodes with GPU support
- type: integer
- default: 4
-
- mem_size_node_with_gpu:
- description: Memory size of K8s nodes with GPU support
- type: string
- default: "8 GB"
-
- disk_size_node_with_gpu:
- description: Size of the local disk on K8s node VMs
- type: scalar-unit.size
-
- num_gpus_node:
- description: Number of GPUs for K8s nodes with GPU support
- type: integer
- default: 1
- constraints:
- - valid_values: [0, 1, 2]
-
- gpu_model_node:
- description: GPU model
- type: string
- default: ""
- constraints:
- - valid_values: ["", "T4", "A30"]
-
- enable_gpu:
- description: Flag to enable GPU support (configure software on GPU accelerated nodes)
- type: boolean
- default: false
-
ports:
description: Ports to open on the K8s master VM
type: map
@@ -154,7 +112,6 @@ topology_template:
properties:
kube_version: 1.24.9
admin_token: { get_input: admin_token }
- enable_gpu: { get_input: enable_gpu }
requirements:
- host: k8s_master_server
@@ -166,16 +123,6 @@ topology_template:
requirements:
- host: k8s_node_server
- k8s_node_with_gpu:
- type: tosca.nodes.DODAS.WorkerNode.Kubernetes
- properties:
- kube_version: 1.23.8
- front_end_ip: { get_attribute: [ k8s_master_server, private_address, 0 ] }
- enable_gpu: { get_input: enable_gpu }
- gpu_model: { get_input: gpu_model_node }
- requirements:
- - host: k8s_node_server_with_gpu
-
k8s_master_server:
type: tosca.nodes.indigo.Compute
properties:
@@ -210,32 +157,11 @@ topology_template:
properties:
num_cpus: { get_input: num_cpus_node }
mem_size: { get_input: mem_size_node }
- # disk_size: { get_input: disk_size_node }
- num_gpus: 0
os:
properties:
distribution: ubuntu
version: 20.04
- k8s_node_server_with_gpu:
- type: tosca.nodes.indigo.Compute
- properties:
- os_users: { get_input: users }
- capabilities:
- scalable:
- properties:
- count: { get_input: number_of_nodes_with_gpu }
- host:
- properties:
- num_cpus: { get_input: num_cpus_node_with_gpu }
- mem_size: { get_input: mem_size_node_with_gpu }
- disk_size: { get_input: disk_size_node_with_gpu }
- num_gpus: { get_input: num_gpus_node }
- gpu_model: { get_input: gpu_model_node }
- os:
- properties:
- distribution: ubuntu
- version: 20.04
outputs:
k8s_endpoint:
@@ -248,7 +174,5 @@ topology_template:
value: { get_attribute: [ k8s_master_server, public_address, 0 ] }
k8s_node_ip:
value: { get_attribute: [ k8s_node_server, private_address ] }
- k8s_node_with_gpu_ip:
- value: { get_attribute: [ k8s_node_server_with_gpu, private_address ] }
os_users:
value: { get_property: [ k8s_master_server, os_users, 0 ] }
--
GitLab
From 7456a07e1b7e6ba3557dc3e558857872ff682912 Mon Sep 17 00:00:00 2001
From: zinus92 <francesco.sinisi@cnaf.infn.it>
Date: Mon, 20 Feb 2023 12:32:29 +0100
Subject: [PATCH 36/36] porta 6443 k8s api
---
kubernetes/k8s_cluster.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index e3008ad..8289429 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -56,7 +56,7 @@ topology_template:
description:
type: map
required: false
- default: { "http": { "protocol": "tcp", "source": 80 }, "https": { "protocol": "tcp", "source": 443 }}
+ default: { "http": { "protocol": "tcp", "source": 80 }, "https": { "protocol": "tcp", "source": 443 }, "api": { "protocol": "tcp", "source": 6443} }
constraints:
- min_length: 0
entry_schema:
--
GitLab