Skip to content
Snippets Groups Projects
Commit d6138dbd authored by Marica Antonacci's avatar Marica Antonacci
Browse files

Merge branch 'tls_fix' into 'master'

Tls fix: put k8s api server on ingress

See merge request infn-cloud/tosca-templates!47
parents 3b430485 72c78737
Branches master
No related tags found
No related merge requests found
......@@ -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/master/custom_types.yaml
description: Deploy a single master Kubernetes 1.17.0 cluster
description: Deploy a single master Kubernetes 1.19.6 cluster
metadata:
display_name: Kubernetes cluster
......@@ -56,7 +56,7 @@ topology_template:
description:
type: map
required: false
default: { "http": { "protocol": "tcp", "source": 80 }, "api": { "protocol": "tcp", "source": 6443 }, "https": { "protocol": "tcp", "source": 443 }}
default: { "http": { "protocol": "tcp", "source": 80 }, "https": { "protocol": "tcp", "source": 443 }}
constraints:
- min_length: 0
entry_schema:
......
......@@ -142,9 +142,6 @@ topology_template:
endpoint:
properties:
ports:
kubeconfig:
protocol: tcp
source: 6443
http:
protocol: tcp
source: 80
......@@ -188,7 +185,7 @@ topology_template:
k8s_dashboard:
value: { concat: [ 'https://dashboard.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it' ] }
k8s_api:
value: { concat: [ 'https://', get_attribute: [ k8s_master_server, public_address, 0 ], ':6443' ] }
value: { concat: [ 'https://api-kubernetes.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it/' ] }
jupyter_endpoint:
value: { concat: [ 'https://jhub.', get_attribute: [ k8s_master_server, public_address, 0 ], '.myip.cloud.infn.it/hub' ] }
k8s_master_ip:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment