Merge pull request #173 from grycap/devel

Devel

templates/htcondor_cluster.yml

@@ -19,6 +19,7 @@ metadata:
   childs:
     - pulsar.yml
     - dydns_egi_update_lrms.yml
+    - proxy_host_cluster.yaml
 
 topology_template:
   inputs:

templates/kubernetes.yaml

@@ -44,6 +44,7 @@ metadata:
     - k8s_galaxy.yaml
     - dydns_egi_update_k8s.yml
     - ades.yaml
+    - proxy_host_k8s.yaml
 
 topology_template:
   inputs:
@@ -141,9 +142,9 @@ topology_template:
     kube_version:
       type: string
       description: Version of Kubernetes to install
-      default: "1.29.5"
+      default: "1.29.7"
       constraints:
-        - valid_values: [ "1.29.5", "1.30.1", "1.28.10", "1.27.14", "1.26.15", "1.25.15", "1.24.17" ]
+        - valid_values: [ "1.29.7", "1.30.3", "1.28.12", "1.27.16", "1.26.15", "1.25.15", "1.24.17" ]
     kube_cri_runtime:
       type: string
       description: CRI Runtime to use with Kubernetes

templates/proxy_host_cluster.yaml

@@ -0,0 +1,61 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/custom_types.yaml
+
+description: Enable to access the Cluster in an private network trought a Proxy/Bastion host.
+
+metadata:
+  template_version: "1.0.2"
+  template_name: Proxy/Bastion host
+  display_name: Enable to access the Cluster trought a Proxy/Bastion host.
+  icon: images/bastion.png
+  tabs:
+    Bastion host:
+      - proxy_host
+      - private_key:
+          tag_type: textarea
+      - user
+  parents:
+    - slurm_cluster.yml
+    - htcondor_cluster.yml
+
+topology_template:
+  inputs:
+
+    proxy_host:
+      type: string
+      description: Proxy/Bastion host needed to access the created VMs
+      default: ""
+    private_key:
+      type: string
+      description: Private key to SSH access to the Proxy/Bastion host
+      default: ""
+    user:
+      type: string
+      description: Username to SSH access to the Proxy/Bastion host
+      default: ""
+
+  node_templates:
+
+    priv_network:
+      type: tosca.nodes.indigo.network.Network
+      properties:
+        network_type: private
+        proxy_host: { get_input: proxy_host }
+        proxy_credential:
+          user: { get_input: user }
+          token_type: private_key
+          token: { get_input: private_key }
+
+    server_port:
+      type: tosca.nodes.network.Port
+      properties:
+        order: 0
+      requirements:
+        - binding: lrms_server
+        - link: priv_network
+
+  outputs:
+    private_ip:
+      value: { get_attribute: [ lrms_server, private_address, 0 ] }

templates/proxy_host_k8s.yaml

@@ -0,0 +1,60 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/custom_types.yaml
+
+description: Enable to access the Kubernetes Cluster in an private network trought a Proxy/Bastion host.
+
+metadata:
+  template_version: "1.0.2"
+  template_name: Proxy/Bastion host
+  display_name: Enable to access the Kubernetes Cluster trought a Proxy/Bastion host.
+  icon: images/bastion.png
+  tabs:
+    Bastion host:
+      - proxy_host
+      - private_key:
+          tag_type: textarea
+      - user
+  parents:
+    - kubernetes.yaml
+
+topology_template:
+  inputs:
+
+    proxy_host:
+      type: string
+      description: Proxy/Bastion host needed to access the created VMs
+      default: ""
+    private_key:
+      type: string
+      description: Private key to SSH access to the Proxy/Bastion host
+      default: ""
+    user:
+      type: string
+      description: Username to SSH access to the Proxy/Bastion host
+      default: ""
+
+  node_templates:
+
+    priv_network:
+      type: tosca.nodes.indigo.network.Network
+      properties:
+        network_type: private
+        proxy_host: { get_input: proxy_host }
+        proxy_credential:
+          user: { get_input: user }
+          token_type: private_key
+          token: { get_input: private_key }
+
+    server_port:
+      type: tosca.nodes.network.Port
+      properties:
+        order: 0
+      requirements:
+        - binding: front
+        - link: priv_network
+
+  outputs:
+    private_ip:
+      value: { get_attribute: [ front, private_address, 0 ] }

templates/slurm_cluster.yml

@@ -7,7 +7,7 @@ description: Deploy a SLURM Virtual Cluster.
 
 metadata:
   template_name: SLURM
-  template_version: "1.1.0"
+  template_version: "1.1.1"
   display_name: SLURM virtual cluster
   icon: images/slurm.png
   order: 4
@@ -23,6 +23,7 @@ metadata:
     - dydns_egi_update_lrms.yml
     - arc.yml
     - dtgeo_tools.yaml
+    - proxy_host_cluster.yaml
 
 topology_template:
   inputs:
@@ -81,9 +82,9 @@ topology_template:
     slurm_version:
       type: string
       description: Version of SLURM to be installed
-      default: 23.11.1
+      default: 23.11.8
       constraints:
-        - valid_values: [ '23.11.1', '20.11.9', '21.08.5', '21.08.8', '22.05.10' ]
+        - valid_values: [ '23.11.8', '20.11.9', '21.08.5', '21.08.8', '22.05.10' ]
 
     fe_ports:
       type: map