This is an automated email from the ASF dual-hosted git repository.

dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/odahu-integration by this push:
     new 12262fc  [odahu-integration] Added configuration of redirectUris for 
keycloak
12262fc is described below

commit 12262fcf404a15d0c4dc61966bc15fc6014f6674
Author: Demyan Mysakovets <[email protected]>
AuthorDate: Fri Mar 27 13:30:21 2020 +0200

    [odahu-integration] Added configuration of redirectUris for keycloak
---
 infrastructure-provisioning/scripts/deploy_dlab.py |   8 +
 .../src/general/conf/dlab.ini                      |  38 ++-
 .../src/general/scripts/gcp/odahu_deploy.py        | 232 ++++++++++------
 .../src/general/scripts/gcp/odahu_prepare.py       |   2 -
 .../src/general/scripts/gcp/odahu_resume.py        | 297 ++++++++++++--------
 .../src/general/scripts/gcp/odahu_suspend.py       | 229 ++++++++++------
 .../src/general/scripts/gcp/odahu_terminate.py     | 301 ++++++++++++---------
 7 files changed, 677 insertions(+), 430 deletions(-)

diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py 
b/infrastructure-provisioning/scripts/deploy_dlab.py
index 8bebb61..37dfdaa 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -123,6 +123,14 @@ parser.add_argument('--resource_id', type=str, 
default='line_item_resource_id',
 parser.add_argument('--odahu_tls_crt', type=str, default='', help='TLS 
Certificate for Odahu cluster')
 parser.add_argument('--odahu_tls_key', type=str, default='', help='TLS Key for 
Odahu cluster')
 parser.add_argument('--odahu_docker_private_repo', type=str, default='', 
help='Odahu private repository url')
+parser.add_argument('--odahu_keysecret', type=str, default='', help='KeySecret 
for Odahuflow examples git')
+parser.add_argument('--odahu_airflow_secret', type=str, default='', 
help='Airflow keycloak service account secret')
+parser.add_argument('--odahu_operator_secret', type=str, default='', 
help='Operator keycloak service account secret')
+parser.add_argument('--odahu_resource_uploader_secret', type=str, default='', 
help='Resource uploader keycloak service'
+                                                                               
       ' account secret')
+parser.add_argument('--odahu_tester_secret', type=str, default='', 
help='Tester keycloak service account secret')
+parser.add_argument('--odahu_tester_data_scientist_secret', type=str, 
default='', help='Tester data scientist keycloak'
+                                                                               
           ' service account secret')
 parser.add_argument('--ldap_hostname', type=str, default='localhost', 
help='Ldap instance hostname')
 parser.add_argument('--ldap_dn', type=str, default='dc=example,dc=com',
                     help='Ldap distinguished name')
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini 
b/infrastructure-provisioning/src/general/conf/dlab.ini
index 392bc48..0dad5d8 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -348,19 +348,29 @@ initial_node_count = 6
 ###
 istio_helm_repo = 
https://storage.googleapis.com/istio-release/releases/1.2.2/charts
 ###
-k8s_version = 1.13.12
+k8s_version = 1.14.10-gke.24
 ###
 helm_repo =  https://raw.githubusercontent.com/odahu/odahu-helm/master
 ###
-infra_version = 1.1.0-rc8
+jupyterhub_enabled = true
 ###
-odahuflow_version = 1.1.0-rc8
+automation_version = 1.1.0
 ###
-mlflow_toolchain_version = 1.1.0-rc8
+infra_version = 1.1.0
 ###
-jupyterlab_version = 1.1.0-rc8
+ui_version = 1.1.0
 ###
-packager_version = 1.1.0-rc10
+examples_version = 1.1.0
+###
+odahuflow_version = 1.1.0
+###
+mlflow_toolchain_version = 1.1.0
+###
+jupyterlab_version = 1.1.0
+###
+packager_version = 1.1.0
+###
+oauth_mesh_enabled = true
 ###
 node_version = 1.13.12-gke.2
 ###
@@ -377,10 +387,22 @@ infra_vpc_peering = 0
 deploy_image = 
gcr.io/or2-msq-epmd-legn-t1iylu/odahu/odahu-flow-automation:1.1.0-rc8-dlab
 ###
 opa_policy = 
cGFja2FnZSBvZGFodQoKIyByb2xlcy5yZWdvCgphZG1pbiA6PSAiYWRtaW4iCmRhdGFfc2NpZW50aXN0IDo9ICJkYXRhX3NjaWVudGlzdCIKCiMgcmJhYy5yZWdvCgpyYmFjIDo9IHsKCWRhdGFfc2NpZW50aXN0OiBbCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC9kZXBsb3ltZW50LioiXSwKICAgIAlbIioiLCAiYXBpL3YxL21vZGVsL3BhY2thZ2luZy4qIl0sCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC90cmFpbmluZy4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL2Nvbm5lY3Rpb24uKiJdLAogICAgCVsiUE9TVCIsICJhcGkvdjEvY29ubmVjdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL3BhY2thZ2luZy9pbnRlZ3JhdGl
 [...]
-###
+### TLS Certificate for Odahu cluster
 # tls_crt =
-###
+### TLS Key for Odahu cluster
 # tls_key =
+### KeySecret for Odahuflow examples git
+# keysecret =
+### Airflow keycloak service account secret
+# airflow_secret =
+### Operator keycloak service account secret
+# operator_secret =
+### Resource uploader keycloak service account secret
+# resource_uploader_secret =
+### Tester keycloak service account secret
+# tester_secret =
+### Tester data scientist keycloak service account secret
+# tester_data_scientist_secret =
 
 #--- [ldap] ldap parameters ---#
 [ldap]
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py 
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 787a3f9..8ca6051 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -48,7 +48,7 @@ if __name__ == "__main__":
     odahu_conf['node_locations'] = GCPMeta().get_available_zones()
     odahu_conf['dns_zone_name'] = os.environ['odahu_dns_zone_name']
     odahu_conf['docker_repo'] = os.environ['odahu_docker_repo']
-    odahu_conf['odahu_cidr'] = os.environ['odahu_cidr']
+    odahu_conf['cidr'] = os.environ['odahu_cidr']
     odahu_conf['service_base_name'] = 
(os.environ['conf_service_base_name']).lower().replace('_', '-')
     odahu_conf['project_name'] = 
(os.environ['project_name']).lower().replace('_', '-')
     odahu_conf['cluster_name'] = 
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
@@ -76,7 +76,7 @@ if __name__ == "__main__":
     odahu_conf['oauth_client_id'] = os.environ['keycloak_client_name']
     odahu_conf['oauth_client_secret'] = os.environ['keycloak_client_secret']
     odahu_conf['oauth_cookie_secret'] = base64.b64encode(id_generator(16))
-    odahu_conf['odahu_infra_version'] = os.environ['odahu_infra_version']
+    odahu_conf['infra_version'] = os.environ['odahu_infra_version']
     odahu_conf['odahuflow_version'] = os.environ['odahu_odahuflow_version']
     odahu_conf['mlflow_toolchain_version'] = 
os.environ['odahu_mlflow_toolchain_version']
     odahu_conf['jupyterlab_version'] = os.environ['odahu_jupyterlab_version']
@@ -91,139 +91,191 @@ if __name__ == "__main__":
     odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
     odahu_conf['decrypt_token'] = id_generator()
     odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
+    odahu_conf['automation_version'] = os.environ['odahu_automation_version']
+    odahu_conf['ui_version'] = os.environ['odahu_ui_version']
+    odahu_conf['examples_version'] = os.environ['odahu_examples_version']
+    odahu_conf['jupyterhub_enabled'] = os.environ['odahu_jupyterhub_enabled']
+    odahu_conf['oauth_mesh_enabled'] = os.environ['odahu_oauth_mesh_enabled']
+    odahu_conf['keysecret'] = os.environ['odahu_keysecret']
+    odahu_conf['airflow_secret'] = os.environ['odahu_airflow_secret']
+    odahu_conf['operator_secret'] =os.environ['odahu_operator_secret']
+    odahu_conf['resource-uploader_secret'] = 
os.environ['odahu_resource_uploader_secret']
+    odahu_conf['tester_secret'] = os.environ['odahu_tester_secret']
+    odahu_conf['tester-data-scientist_secret'] = 
os.environ['odahu_tester_data_scientist_secret']
 
     print('Preparing parameters file')
     try:
         local("cp /root/templates/profile.json /tmp/")
         with open("/tmp/profile.json", 'w') as profile:
-            prof = {"allowed_ips": odahu_conf['allowed_cidr'],
-                    "cloud_type": "gcp",
+            prof ={
+                    "allowed_ips": odahu_conf['allowed_cidr'],
+                    "authorization_enabled": "true",
+                    "authz_dry_run": "false",
+                    "cloud": {
+                        "gcp": {
+                            "node_locations": odahu_conf['node_locations'],
+                            "project_id": 
"{}".format(odahu_conf['project_id']),
+                            "region": "{}".format(odahu_conf['region']),
+                            "zone": "{}".format(odahu_conf['zone']),
+                        },
+                        "type": "gcp"
+                    },
                     "cluster_name": "{}".format(odahu_conf['cluster_name']),
                     "cluster_type": "gcp/gke",
-                    "cluster_context": "",
-                    "dns_zone_name": "{}".format(odahu_conf['dns_zone_name']),
+                    "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
+
+                    "dns": {
+                        "domain": "{}".format(odahu_conf['root_domain']),
+                        "gcp_project_id": 
"{}".format(odahu_conf['project_id']),
+                        "provider": "gcp",
+                        "zone_name": "{}".format(odahu_conf['dns_zone_name']),
+                    },
                     "docker_password": "",
                     "docker_repo": "{}".format(odahu_conf['docker_repo']),
-                    "docker_user": "",
-                    "gcp_cidr": "{}".format(odahu_conf['odahu_cidr']),
-                    "gke_node_tag": 
"{}-gke-node".format(odahu_conf['cluster_name']).split(','),
-                    "grafana_admin": "{}".format(odahu_conf['grafana_admin']),
-                    "grafana_pass": "BMuYxTw6v5",
-                    "oauth_oidc_audience": "legion",
-                    "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
-                    "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
+                    "docker_username": "",
+                    "gcp_cidr": "{}".format(odahu_conf['cidr']),
+                    "examples_version": 
"{}".format(odahu_conf['examples_version']),
+                    "grafana_pass": "{}".format(odahu_conf['grafana_pass']),
                     "helm_repo": "{}".format(odahu_conf['helm_repo']),
-                    "odahu_infra_version": 
"{}".format(odahu_conf['odahu_infra_version']),
-                    "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
-                    "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
+                    "jupyterhub_enabled": odahu_conf['jupyterhub_enabled'],
                     "jupyterlab_version": 
"{}".format(odahu_conf['jupyterlab_version']),
-                    "packager_version": 
"{}".format(odahu_conf['packager_version']),
-                    "vpc_name": "{}".format(odahu_conf['vpc_name']),
-                    "subnet_name": 
"{}".format(odahu_conf['private_subnet_name']),
-                    "node_locations": odahu_conf['node_locations'],
-                    "node_labels": {
-                        "name": "{}".format(odahu_conf['cluster_name']),
-                        "product": "dlab",
-                        "user": "{}".format(odahu_conf['edge_user_name']),
-                        "sbn": "{}".format(odahu_conf['service_base_name'])
-                    },
-                    "oauth_client_id": 
"{}".format(odahu_conf['oauth_client_id']),
-                    "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
-                    "oauth_cookie_secret": "OWl6VnV3SHNIQzVyMThqVw==",
-                    "oauth_oidc_scope": "openid profile email offline_access 
groups",
-                    "oauth_oidc_host": 
"{}".format(odahu_conf['oauth_oidc_host']),
-                    "oauth_oidc_jwks_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
-                    "oauth_oidc_port": 443,
-                    "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
-                    "project_id": "{}".format(odahu_conf['project_id']),
-                    "region": "{}".format(odahu_conf['region']),
-                    "root_domain": "{}".format(odahu_conf['root_domain']),
-                    "service_cidr": "{}".format(odahu_conf['service_cidr']),
-                    "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
-                    "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
-                    "tls_crt": "{}".format(odahu_conf['tls_crt']),
-                    "tls_key": "{}".format(odahu_conf['tls_key']),
-                    "zone": "{}".format(odahu_conf['zone']),
-                    "dns_project_id": 
"{}".format(odahu_conf['dns_project_id']),
-                    "odahuflow_connection_decrypt_token": "qfY2k5bA2M",
-                    "authorization_enabled": "true",
-                    "authz_dry_run": "true",
-                    "github_org_name": "",
-                    "oauth_local_jwks": "",
-                    "oauth_mesh_enabled": "false",
-                    "k8s_version": "1.14.10-gke.17",
-                    "opa_policies": {
-                        "policy.rego": 
"cGFja2FnZSBvZGFodQoKIyByb2xlcy5yZWdvCgphZG1pbiA6PSAiYWRtaW4iCmRhdGFfc2NpZW50aXN0IDo9ICJkYXRhX3NjaWVudGlzdCIKCiMgcmJhYy5yZWdvCgpyYmFjIDo9IHsKCWRhdGFfc2NpZW50aXN0OiBbCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC9kZXBsb3ltZW50LioiXSwKICAgIAlbIioiLCAiYXBpL3YxL21vZGVsL3BhY2thZ2luZy4qIl0sCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC90cmFpbmluZy4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL2Nvbm5lY3Rpb24uKiJdLAogICAgCVsiUE9TVCIsICJhcGkvdjEvY29ubmVjdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3Yx
 [...]
+                    "k8s_version": "{}".format(odahu_conf['k8s_version']),
+                    "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
                     "node_pools": {
-                        "packaging": {
+                        "main": {
                             "disk_size_gb": 64,
+                            "init_node_count": 3,
+                            "max_node_count": 5,
+                            "min_node_count": 1
+                        },
+                        "model_deployment": {
+                            "labels": {
+                                "mode": "odahu-flow-deployment"
+                            },
                             "max_node_count": 3,
+                            "taints": [
+                                {
+                                    "effect": "NO_SCHEDULE",
+                                    "key": "dedicated",
+                                    "value": "deployment"
+                                }
+                            ]
+                        },
+                        "packaging": {
+                            "disk_size_gb": 64,
+                            "disk_type": "pd-ssd",
                             "labels": {
                                 "mode": "odahu-flow-packaging"
                             },
+                            "machine_type": "n1-standard-4",
+                            "max_node_count": 3,
                             "taints": [
                                 {
-                                    "value": "packaging",
                                     "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
+                                    "key": "dedicated",
+                                    "value": "packaging"
                                 }
-                            ],
-                            "machine_type": "n1-standard-4",
-                            "disk_type": "pd-ssd"
+                            ]
                         },
                         "training": {
+                            "disk_size_gb": 100,
                             "labels": {
                                 "mode": "odahu-flow-training"
                             },
-                            "disk_size_gb": 100,
+                            "machine_type": "n1-highcpu-8",
                             "taints": [
                                 {
-                                    "value": "training",
                                     "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
+                                    "key": "dedicated",
+                                    "value": "training"
                                 }
-                            ],
-                            "machine_type": "n1-highcpu-8"
-                        },
-                        "main": {
-                            "init_node_count": 3,
-                            "disk_size_gb": 64,
-                            "min_node_count": 1,
-                            "max_node_count": 5
+                            ]
                         },
                         "training_gpu": {
-                            "labels": {
-                                "mode": "odahu-flow-training-gpu"
-                            },
+                            "disk_size_gb": 100,
                             "gpu": [
                                 {
                                     "count": 2,
                                     "type": "nvidia-tesla-p100"
                                 }
                             ],
-                            "disk_size_gb": 100,
-                            "taints": [
-                                {
-                                    "value": "training-gpu",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-standard-8"
-                        },
-                        "model_deployment": {
                             "labels": {
-                                "mode": "odahu-flow-deployment"
+                                "mode": "odahu-flow-training-gpu"
                             },
+                            "machine_type": "n1-standard-8",
                             "taints": [
                                 {
-                                    "value": "deployment",
                                     "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
+                                    "key": "dedicated",
+                                    "value": "training-gpu"
                                 }
-                            ],
-                            "max_node_count": 3
+                            ]
+                        }
+                    },
+                    "oauth_client_id": 
"{}".format(odahu_conf['oauth_client_id']),
+                    "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
+                    "oauth_cookie_secret": 
"{}".format(odahu_conf['oauth_cookie_secret']),
+                    "oauth_local_jwks": "",
+                    "oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
+                    "oauth_oidc_audience": "legion",
+                    "oauth_oidc_host": 
"{}".format(odahu_conf['oauth_oidc_host']),
+                    "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
+                    "oauth_oidc_jwks_url": 
"{}/protocol/openid-connect/certs".format(odahu_conf['oauth_oidc_issuer_url']),
+                    "oauth_oidc_port": 443,
+                    "oauth_oidc_scope": "openid profile email offline_access 
groups",
+                    "oauth_oidc_token_endpoint": 
"{}/protocol/openid-connect/token".format(odahu_conf['oauth_oidc_issuer_url']),
+                    "odahu_automation_version": 
"{}".format(odahu_conf['automation_version']),
+                    "odahu_infra_version": 
"{}".format(odahu_conf['nfra_version']),
+                    "odahu_ui_version": "{}".format(odahu_conf['ui_version']),
+                    "odahuflow_connection_decrypt_token": 
"{}".format(odahu_conf['decrypt_token']),
+                    "odahuflow_connections": [
+                        {
+                            "id": "odahu-flow-examples",
+                            "spec": {
+                                "description": "Git repository with the 
Odahu-Flow examples",
+                                "keySecret": 
"{}".format(odahu_conf['keysecret']),
+                                "reference": 
"{}".format(odahu_conf['examples_version']),
+                                "type": "git",
+                                "uri": 
"[email protected]:odahu/odahu-examples.git",
+                                "webUILink": 
"https://github.com/odahu/odahu-examples";
+                            }
+                        }
+                    ],
+                    "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
+                    "opa_policies": {},
+                    "packager_version": 
"{}".format(odahu_conf['packager_version']),
+                    "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
+                    "service_accounts": {
+                        "airflow": {
+                            "client_id": "sa-airflow",
+                            "client_secret": 
"{}".format(odahu_conf['sa-airflow_secret'])
+                        },
+                        "operator": {
+                            "client_id": "sa-operator",
+                            "client_secret": 
"{}".format(odahu_conf['sa-operator_secret'])
+                        },
+                        "resource_uploader": {
+                            "client_id": "sa-resource-uploader",
+                            "client_secret": 
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+                        },
+                        "test": {
+                            "client_id": "sa-tester",
+                            "client_secret": 
"{}".format(odahu_conf['sa-tester_secret'])
+                        },
+                        "test_data_scientist": {
+                            "client_id": "sa-tester-data-scientist",
+                            "client_secret": 
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
                         }
+                    },
+                    "service_cidr": "{}".format(odahu_conf['service_cidr']),
+                    "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
+                    "subnet_name": 
"{}".format(odahu_conf['private_subnet_name']),
+                    "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
+                    "tls_crt": "{}".format(odahu_conf['tls_crt']),
+                    "tls_key": "{}".format(odahu_conf['tls_key']),
+                    "vpc_name": "{}".format(odahu_conf['vpc_name']),
+                    "vault": {
+                        "enabled": true
                     }
                     }
             profile.write(json.dumps(prof))
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py 
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py
index 4712ee2..5b9bf4f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py
@@ -130,10 +130,8 @@ if __name__ == "__main__":
             keycloak_update_Uris = requests.put(client_url, 
json=updated_client_data,
                                             headers={"Authorization": "Bearer 
" + keycloak_token.get("access_token"),
                                                      "Content-Type": 
"application/json"}, verify=False)
-
         except Exception as err:
             append_result("Failed to configure keycloak.")
-            raise Exception
             sys.exit(1)
     except Exception as err:
         print('Error: {0}'.format(err))
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py 
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index d6a4ef1..39f5c23 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -50,7 +50,7 @@ if __name__ == "__main__":
     odahu_conf['node_locations'] = GCPMeta().get_available_zones()
     odahu_conf['dns_zone_name'] = os.environ['odahu_dns_zone_name']
     odahu_conf['docker_repo'] = os.environ['odahu_docker_repo']
-    odahu_conf['odahu_cidr'] = os.environ['odahu_cidr']
+    odahu_conf['cidr'] = os.environ['odahu_cidr']
     odahu_conf['service_base_name'] = 
(os.environ['conf_service_base_name']).lower().replace('_', '-')
     odahu_conf['project_name'] = 
(os.environ['project_name']).lower().replace('_', '-')
     odahu_conf['cluster_name'] = 
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
@@ -78,7 +78,7 @@ if __name__ == "__main__":
     odahu_conf['oauth_client_id'] = os.environ['keycloak_client_name']
     odahu_conf['oauth_client_secret'] = os.environ['keycloak_client_secret']
     odahu_conf['oauth_cookie_secret'] = os.environ['oauth_cookie_secret']
-    odahu_conf['odahu_infra_version'] = os.environ['odahu_infra_version']
+    odahu_conf['infra_version'] = os.environ['odahu_infra_version']
     odahu_conf['odahuflow_version'] = os.environ['odahu_odahuflow_version']
     odahu_conf['mlflow_toolchain_version'] = 
os.environ['odahu_mlflow_toolchain_version']
     odahu_conf['jupyterlab_version'] = os.environ['odahu_jupyterlab_version']
@@ -93,137 +93,194 @@ if __name__ == "__main__":
     odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
     odahu_conf['decrypt_token'] = 
os.environ['odahuflow_connection_decrypt_token']
     odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
+    odahu_conf['automation_version'] = os.environ['odahu_automation_version']
+    odahu_conf['ui_version'] = os.environ['odahu_ui_version']
+    odahu_conf['examples_version'] = os.environ['odahu_examples_version']
+    odahu_conf['jupyterhub_enabled'] = os.environ['odahu_jupyterhub_enabled']
+    odahu_conf['oauth_mesh_enabled'] = os.environ['odahu_oauth_mesh_enabled']
+    odahu_conf['keysecret'] = os.environ['odahu_keysecret']
+    odahu_conf['airflow_secret'] = os.environ['odahu_airflow_secret']
+    odahu_conf['operator_secret'] = os.environ['odahu_operator_secret']
+    odahu_conf['resource-uploader_secret'] = 
os.environ['odahu_resource_uploader_secret']
+    odahu_conf['tester_secret'] = os.environ['odahu_tester_secret']
+    odahu_conf['tester-data-scientist_secret'] = 
os.environ['odahu_tester_data_scientist_secret']
 
     print('Preparing parameters file')
     try:
         local("cp /root/templates/profile.json /tmp/")
         with open("/tmp/profile.json", 'w') as profile:
-            prof = {"allowed_ips": odahu_conf['allowed_cidr'],
-                    "cloud_type": "gcp",
-                    "cluster_name": "{}".format(odahu_conf['cluster_name']),
-                    "cluster_type": "gcp/gke",
-                    "dns_zone_name": "{}".format(odahu_conf['dns_zone_name']),
-                    "docker_password": "",
-                    "docker_repo": "{}".format(odahu_conf['docker_repo']),
-                    "docker_user": "",
-                    "gcp_cidr": "{}".format(odahu_conf['odahu_cidr']),
-                    "gke_node_tag": 
"{}-gke-node".format(odahu_conf['cluster_name']),
-                    "grafana_admin": "{}".format(odahu_conf['grafana_admin']),
-                    "grafana_pass": "{}".format(odahu_conf['grafana_pass']),
-                    "oauth_oidc_audience": "legion",
-                    "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
-                    "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
-                    "helm_repo": "{}".format(odahu_conf['helm_repo']),
-                    "odahu_infra_version": 
"{}".format(odahu_conf['odahu_infra_version']),
-                    "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
-                    "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
-                    "jupyterlab_version": 
"{}".format(odahu_conf['jupyterlab_version']),
-                    "packager_version": 
"{}".format(odahu_conf['packager_version']),
-                    "vpc_name": "{}".format(odahu_conf['vpc_name']),
-                    "subnet_name": 
"{}".format(odahu_conf['private_subnet_name']),
-                    "node_locations": odahu_conf['node_locations'],
-                    "node_labels": {
-                        "name": "{}".format(odahu_conf['cluster_name']),
-                        "product": "dlab",
-                        "user": "{}".format(odahu_conf['edge_user_name']),
-                        "sbn": "{}".format(odahu_conf['service_base_name'])
+            prof = {
+                "allowed_ips": odahu_conf['allowed_cidr'],
+                "authorization_enabled": "true",
+                "authz_dry_run": "false",
+                "cloud": {
+                    "gcp": {
+                        "node_locations": odahu_conf['node_locations'],
+                        "project_id": "{}".format(odahu_conf['project_id']),
+                        "region": "{}".format(odahu_conf['region']),
+                        "zone": "{}".format(odahu_conf['zone']),
                     },
-                    "oauth_client_id": 
"{}".format(odahu_conf['oauth_client_id']),
-                    "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
-                    "oauth_cookie_secret": 
"{}".format(odahu_conf['oauth_cookie_secret']),
-                    "oauth_oidc_scope": "openid profile email offline_access 
groups",
-                    "oauth_oidc_host": 
"{}".format(odahu_conf['oauth_oidc_host']),
-                    "oauth_oidc_jwks_url": 
"https://idp.demo.dlabanalytics.com/auth/realms/dlab/protocol/openid-connect/certs";,
-                    "oauth_oidc_port": 443,
-                    "oauth_local_jwks": "",
-                    "oauth_mesh_enabled": "false",
-                    "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
-                    "project_id": "{}".format(odahu_conf['project_id']),
-                    "region": "{}".format(odahu_conf['region']),
-                    "root_domain": "{}".format(odahu_conf['root_domain']),
-                    "service_cidr": "{}".format(odahu_conf['service_cidr']),
-                    "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
-                    "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
-                    "tls_crt": "{}".format(odahu_conf['tls_crt']),
-                    "tls_key": "{}".format(odahu_conf['tls_key']),
-                    "zone": "{}".format(odahu_conf['zone']),
-                    "dns_project_id": 
"{}".format(odahu_conf['dns_project_id']),
-                    "odahuflow_connection_decrypt_token": 
"{}".format(odahu_conf['decrypt_token']),
-                    "authorization_enabled": "true",
-                    "authz_dry_run": "true",
-                    "k8s_version": "1.13.12-gke.25",
-                    "node_pools": {
-                        "packaging": {
-                            "disk_size_gb": 64,
-                            "max_node_count": 3,
-                            "labels": {
-                                "mode": "odahu-flow-packaging"
-                            },
-                            "taints": [
-                                {
-                                    "value": "packaging",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-standard-4",
-                            "disk_type": "pd-ssd"
+                    "type": "gcp"
+                },
+                "cluster_name": "{}".format(odahu_conf['cluster_name']),
+                "cluster_type": "gcp/gke",
+                "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
+
+                "dns": {
+                    "domain": "{}".format(odahu_conf['root_domain']),
+                    "gcp_project_id": "{}".format(odahu_conf['project_id']),
+                    "provider": "gcp",
+                    "zone_name": "{}".format(odahu_conf['dns_zone_name']),
+                },
+                "docker_password": "",
+                "docker_repo": "{}".format(odahu_conf['docker_repo']),
+                "docker_username": "",
+                "gcp_cidr": "{}".format(odahu_conf['cidr']),
+                "examples_version": 
"{}".format(odahu_conf['examples_version']),
+                "grafana_pass": "{}".format(odahu_conf['grafana_pass']),
+                "helm_repo": "{}".format(odahu_conf['helm_repo']),
+                "jupyterhub_enabled": odahu_conf['jupyterhub_enabled'],
+                "jupyterlab_version": 
"{}".format(odahu_conf['jupyterlab_version']),
+                "k8s_version": "{}".format(odahu_conf['k8s_version']),
+                "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
+                "node_pools": {
+                    "main": {
+                        "disk_size_gb": 64,
+                        "init_node_count": 3,
+                        "max_node_count": 5,
+                        "min_node_count": 1
+                    },
+                    "model_deployment": {
+                        "labels": {
+                            "mode": "odahu-flow-deployment"
                         },
-                        "training": {
-                            "labels": {
-                                "mode": "odahu-flow-training"
-                            },
-                            "disk_size_gb": 100,
-                            "taints": [
-                                {
-                                    "value": "training",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-highcpu-8"
+                        "max_node_count": 3,
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "deployment"
+                            }
+                        ]
+                    },
+                    "packaging": {
+                        "disk_size_gb": 64,
+                        "disk_type": "pd-ssd",
+                        "labels": {
+                            "mode": "odahu-flow-packaging"
                         },
-                        "main": {
-                            "init_node_count": 8,
-                            "disk_size_gb": 64,
-                            "min_node_count": 1,
-                            "max_node_count": 5
+                        "machine_type": "n1-standard-4",
+                        "max_node_count": 3,
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "packaging"
+                            }
+                        ]
+                    },
+                    "training": {
+                        "disk_size_gb": 100,
+                        "labels": {
+                            "mode": "odahu-flow-training"
                         },
-                        "training_gpu": {
-                            "labels": {
-                                "mode": "odahu-flow-training-gpu"
-                            },
-                            "gpu": [
-                                {
-                                    "count": 2,
-                                    "type": "nvidia-tesla-p100"
-                                }
-                            ],
-                            "disk_size_gb": 100,
-                            "taints": [
-                                {
-                                    "value": "training-gpu",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-standard-8"
+                        "machine_type": "n1-highcpu-8",
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "training"
+                            }
+                        ]
+                    },
+                    "training_gpu": {
+                        "disk_size_gb": 100,
+                        "gpu": [
+                            {
+                                "count": 2,
+                                "type": "nvidia-tesla-p100"
+                            }
+                        ],
+                        "labels": {
+                            "mode": "odahu-flow-training-gpu"
                         },
-                        "model_deployment": {
-                            "labels": {
-                                "mode": "odahu-flow-deployment"
-                            },
-                            "taints": [
-                                {
-                                    "value": "deployment",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "max_node_count": 3
+                        "machine_type": "n1-standard-8",
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "training-gpu"
+                            }
+                        ]
+                    }
+                },
+                "oauth_client_id": "{}".format(odahu_conf['oauth_client_id']),
+                "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
+                "oauth_cookie_secret": 
"{}".format(odahu_conf['oauth_cookie_secret']),
+                "oauth_local_jwks": "",
+                "oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
+                "oauth_oidc_audience": "legion",
+                "oauth_oidc_host": "{}".format(odahu_conf['oauth_oidc_host']),
+                "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
+                "oauth_oidc_jwks_url": 
"{}/protocol/openid-connect/certs".format(odahu_conf['oauth_oidc_issuer_url']),
+                "oauth_oidc_port": 443,
+                "oauth_oidc_scope": "openid profile email offline_access 
groups",
+                "oauth_oidc_token_endpoint": 
"{}/protocol/openid-connect/token".format(
+                    odahu_conf['oauth_oidc_issuer_url']),
+                "odahu_automation_version": 
"{}".format(odahu_conf['automation_version']),
+                "odahu_infra_version": "{}".format(odahu_conf['nfra_version']),
+                "odahu_ui_version": "{}".format(odahu_conf['ui_version']),
+                "odahuflow_connection_decrypt_token": 
"{}".format(odahu_conf['decrypt_token']),
+                "odahuflow_connections": [
+                    {
+                        "id": "odahu-flow-examples",
+                        "spec": {
+                            "description": "Git repository with the Odahu-Flow 
examples",
+                            "keySecret": "{}".format(odahu_conf['keysecret']),
+                            "reference": 
"{}".format(odahu_conf['examples_version']),
+                            "type": "git",
+                            "uri": "[email protected]:odahu/odahu-examples.git",
+                            "webUILink": 
"https://github.com/odahu/odahu-examples";
                         }
                     }
+                ],
+                "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
+                "opa_policies": {},
+                "packager_version": 
"{}".format(odahu_conf['packager_version']),
+                "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
+                "service_accounts": {
+                    "airflow": {
+                        "client_id": "sa-airflow",
+                        "client_secret": 
"{}".format(odahu_conf['sa-airflow_secret'])
+                    },
+                    "operator": {
+                        "client_id": "sa-operator",
+                        "client_secret": 
"{}".format(odahu_conf['sa-operator_secret'])
+                    },
+                    "resource_uploader": {
+                        "client_id": "sa-resource-uploader",
+                        "client_secret": 
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+                    },
+                    "test": {
+                        "client_id": "sa-tester",
+                        "client_secret": 
"{}".format(odahu_conf['sa-tester_secret'])
+                    },
+                    "test_data_scientist": {
+                        "client_id": "sa-tester-data-scientist",
+                        "client_secret": 
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
                     }
+                },
+                "service_cidr": "{}".format(odahu_conf['service_cidr']),
+                "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
+                "subnet_name": "{}".format(odahu_conf['private_subnet_name']),
+                "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
+                "tls_crt": "{}".format(odahu_conf['tls_crt']),
+                "tls_key": "{}".format(odahu_conf['tls_key']),
+                "vpc_name": "{}".format(odahu_conf['vpc_name']),
+                "vault": {
+                    "enabled": true
+                }
+            }
             profile.write(json.dumps(prof))
         local('cat /tmp/profile.json')
         local('cp /tmp/profile.json /')
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py 
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index 4736e02..b0945ad 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
@@ -48,7 +48,7 @@ if __name__ == "__main__":
     odahu_conf['node_locations'] = GCPMeta().get_available_zones()
     odahu_conf['dns_zone_name'] = os.environ['odahu_dns_zone_name']
     odahu_conf['docker_repo'] = os.environ['odahu_docker_repo']
-    odahu_conf['odahu_cidr'] = os.environ['odahu_cidr']
+    odahu_conf['cidr'] = os.environ['odahu_cidr']
     odahu_conf['service_base_name'] = 
(os.environ['conf_service_base_name']).lower().replace('_', '-')
     odahu_conf['project_name'] = 
(os.environ['project_name']).lower().replace('_', '-')
     odahu_conf['cluster_name'] = 
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
@@ -76,7 +76,7 @@ if __name__ == "__main__":
     odahu_conf['oauth_client_id'] = os.environ['keycloak_client_name']
     odahu_conf['oauth_client_secret'] = os.environ['keycloak_client_secret']
     odahu_conf['oauth_cookie_secret'] = os.environ['oauth_cookie_secret']
-    odahu_conf['odahu_infra_version'] = os.environ['odahu_infra_version']
+    odahu_conf['infra_version'] = os.environ['odahu_infra_version']
     odahu_conf['odahuflow_version'] = os.environ['odahu_odahuflow_version']
     odahu_conf['mlflow_toolchain_version'] = 
os.environ['odahu_mlflow_toolchain_version']
     odahu_conf['jupyterlab_version'] = os.environ['odahu_jupyterlab_version']
@@ -91,137 +91,194 @@ if __name__ == "__main__":
     odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
     odahu_conf['decrypt_token'] = 
os.environ['odahuflow_connection_decrypt_token']
     odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
+    odahu_conf['automation_version'] = os.environ['odahu_automation_version']
+    odahu_conf['ui_version'] = os.environ['odahu_ui_version']
+    odahu_conf['examples_version'] = os.environ['odahu_examples_version']
+    odahu_conf['jupyterhub_enabled'] = os.environ['odahu_jupyterhub_enabled']
+    odahu_conf['oauth_mesh_enabled'] = os.environ['odahu_oauth_mesh_enabled']
+    odahu_conf['keysecret'] = os.environ['odahu_keysecret']
+    odahu_conf['airflow_secret'] = os.environ['odahu_airflow_secret']
+    odahu_conf['operator_secret'] = os.environ['odahu_operator_secret']
+    odahu_conf['resource-uploader_secret'] = 
os.environ['odahu_resource_uploader_secret']
+    odahu_conf['tester_secret'] = os.environ['odahu_tester_secret']
+    odahu_conf['tester-data-scientist_secret'] = 
os.environ['odahu_tester_data_scientist_secret']
 
     print('Preparing parameters file')
     try:
         local("cp /root/templates/profile.json /tmp/")
         with open("/tmp/profile.json", 'w') as profile:
-            prof = {"allowed_ips": odahu_conf['allowed_cidr'],
-                    "cloud_type": "gcp",
+            prof = {
+                    "allowed_ips": odahu_conf['allowed_cidr'],
+                    "authorization_enabled": "true",
+                    "authz_dry_run": "false",
+                    "cloud": {
+                        "gcp": {
+                            "node_locations": odahu_conf['node_locations'],
+                            "project_id": 
"{}".format(odahu_conf['project_id']),
+                            "region": "{}".format(odahu_conf['region']),
+                            "zone": "{}".format(odahu_conf['zone']),
+                        },
+                        "type": "gcp"
+                    },
                     "cluster_name": "{}".format(odahu_conf['cluster_name']),
                     "cluster_type": "gcp/gke",
-                    "dns_zone_name": "{}".format(odahu_conf['dns_zone_name']),
+                    "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
+
+                    "dns": {
+                        "domain": "{}".format(odahu_conf['root_domain']),
+                        "gcp_project_id": 
"{}".format(odahu_conf['project_id']),
+                        "provider": "gcp",
+                        "zone_name": "{}".format(odahu_conf['dns_zone_name']),
+                    },
                     "docker_password": "",
                     "docker_repo": "{}".format(odahu_conf['docker_repo']),
-                    "docker_user": "",
-                    "gcp_cidr": "{}".format(odahu_conf['odahu_cidr']),
-                    "gke_node_tag": 
"{}-gke-node".format(odahu_conf['cluster_name']),
-                    "grafana_admin": "{}".format(odahu_conf['grafana_admin']),
+                    "docker_username": "",
+                    "gcp_cidr": "{}".format(odahu_conf['cidr']),
+                    "examples_version": 
"{}".format(odahu_conf['examples_version']),
                     "grafana_pass": "{}".format(odahu_conf['grafana_pass']),
-                    "oauth_oidc_audience": "legion",
-                    "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
-                    "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
                     "helm_repo": "{}".format(odahu_conf['helm_repo']),
-                    "odahu_infra_version": 
"{}".format(odahu_conf['odahu_infra_version']),
-                    "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
-                    "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
+                    "jupyterhub_enabled": odahu_conf['jupyterhub_enabled'],
                     "jupyterlab_version": 
"{}".format(odahu_conf['jupyterlab_version']),
-                    "packager_version": 
"{}".format(odahu_conf['packager_version']),
-                    "vpc_name": "{}".format(odahu_conf['vpc_name']),
-                    "subnet_name": 
"{}".format(odahu_conf['private_subnet_name']),
-                    "node_locations": odahu_conf['node_locations'],
-                    "node_labels": {
-                        "name": "{}".format(odahu_conf['cluster_name']),
-                        "product": "dlab",
-                        "user": "{}".format(odahu_conf['edge_user_name']),
-                        "sbn": "{}".format(odahu_conf['service_base_name'])
-                    },
-                    "oauth_client_id": 
"{}".format(odahu_conf['oauth_client_id']),
-                    "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
-                    "oauth_cookie_secret": 
"{}".format(odahu_conf['oauth_cookie_secret']),
-                    "oauth_oidc_scope": "openid profile email offline_access 
groups",
-                    "oauth_oidc_host": 
"{}".format(odahu_conf['oauth_oidc_host']),
-                    "oauth_oidc_jwks_url": 
"https://idp.demo.dlabanalytics.com/auth/realms/dlab/protocol/openid-connect/certs";,
-                    "oauth_oidc_port": 443,
-                    "oauth_local_jwks": "",
-                    "oauth_mesh_enabled": "false",
-                    "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
-                    "project_id": "{}".format(odahu_conf['project_id']),
-                    "region": "{}".format(odahu_conf['region']),
-                    "root_domain": "{}".format(odahu_conf['root_domain']),
-                    "service_cidr": "{}".format(odahu_conf['service_cidr']),
-                    "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
-                    "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
-                    "tls_crt": "{}".format(odahu_conf['tls_crt']),
-                    "tls_key": "{}".format(odahu_conf['tls_key']),
-                    "zone": "{}".format(odahu_conf['zone']),
-                    "dns_project_id": 
"{}".format(odahu_conf['dns_project_id']),
-                    "odahuflow_connection_decrypt_token": 
"{}".format(odahu_conf['decrypt_token']),
-                    "authorization_enabled": "true",
-                    "authz_dry_run": "true",
-                    "k8s_version": "1.13.12-gke.25",
+                    "k8s_version": "{}".format(odahu_conf['k8s_version']),
+                    "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
                     "node_pools": {
-                        "packaging": {
+                        "main": {
                             "disk_size_gb": 64,
+                            "init_node_count": 3,
+                            "max_node_count": 5,
+                            "min_node_count": 1
+                        },
+                        "model_deployment": {
+                            "labels": {
+                                "mode": "odahu-flow-deployment"
+                            },
                             "max_node_count": 3,
+                            "taints": [
+                                {
+                                    "effect": "NO_SCHEDULE",
+                                    "key": "dedicated",
+                                    "value": "deployment"
+                                }
+                            ]
+                        },
+                        "packaging": {
+                            "disk_size_gb": 64,
+                            "disk_type": "pd-ssd",
                             "labels": {
                                 "mode": "odahu-flow-packaging"
                             },
+                            "machine_type": "n1-standard-4",
+                            "max_node_count": 3,
                             "taints": [
                                 {
-                                    "value": "packaging",
                                     "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
+                                    "key": "dedicated",
+                                    "value": "packaging"
                                 }
-                            ],
-                            "machine_type": "n1-standard-4",
-                            "disk_type": "pd-ssd"
+                            ]
                         },
                         "training": {
+                            "disk_size_gb": 100,
                             "labels": {
                                 "mode": "odahu-flow-training"
                             },
-                            "disk_size_gb": 100,
+                            "machine_type": "n1-highcpu-8",
                             "taints": [
                                 {
-                                    "value": "training",
                                     "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
+                                    "key": "dedicated",
+                                    "value": "training"
                                 }
-                            ],
-                            "machine_type": "n1-highcpu-8"
-                        },
-                        "main": {
-                            "init_node_count": 3,
-                            "disk_size_gb": 64,
-                            "min_node_count": 1,
-                            "max_node_count": 5
+                            ]
                         },
                         "training_gpu": {
-                            "labels": {
-                                "mode": "odahu-flow-training-gpu"
-                            },
+                            "disk_size_gb": 100,
                             "gpu": [
                                 {
                                     "count": 2,
                                     "type": "nvidia-tesla-p100"
                                 }
                             ],
-                            "disk_size_gb": 100,
-                            "taints": [
-                                {
-                                    "value": "training-gpu",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-standard-8"
-                        },
-                        "model_deployment": {
                             "labels": {
-                                "mode": "odahu-flow-deployment"
+                                "mode": "odahu-flow-training-gpu"
                             },
+                            "machine_type": "n1-standard-8",
                             "taints": [
                                 {
-                                    "value": "deployment",
                                     "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
+                                    "key": "dedicated",
+                                    "value": "training-gpu"
                                 }
-                            ],
-                            "max_node_count": 3
+                            ]
                         }
+                    },
+                    "oauth_client_id": 
"{}".format(odahu_conf['oauth_client_id']),
+                    "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
+                    "oauth_cookie_secret": 
"{}".format(odahu_conf['oauth_cookie_secret']),
+                    "oauth_local_jwks": "",
+                    "oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
+                    "oauth_oidc_audience": "legion",
+                    "oauth_oidc_host": 
"{}".format(odahu_conf['oauth_oidc_host']),
+                    "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
+                    "oauth_oidc_jwks_url": 
"{}/protocol/openid-connect/certs".format(odahu_conf['oauth_oidc_issuer_url']),
+                    "oauth_oidc_port": 443,
+                    "oauth_oidc_scope": "openid profile email offline_access 
groups",
+                    "oauth_oidc_token_endpoint": 
"{}/protocol/openid-connect/token".format(
+                        odahu_conf['oauth_oidc_issuer_url']),
+                    "odahu_automation_version": 
"{}".format(odahu_conf['automation_version']),
+                    "odahu_infra_version": 
"{}".format(odahu_conf['nfra_version']),
+                    "odahu_ui_version": "{}".format(odahu_conf['ui_version']),
+                    "odahuflow_connection_decrypt_token": 
"{}".format(odahu_conf['decrypt_token']),
+                    "odahuflow_connections": [
+                        {
+                            "id": "odahu-flow-examples",
+                            "spec": {
+                                "description": "Git repository with the 
Odahu-Flow examples",
+                                "keySecret": 
"{}".format(odahu_conf['keysecret']),
+                                "reference": 
"{}".format(odahu_conf['examples_version']),
+                                "type": "git",
+                                "uri": 
"[email protected]:odahu/odahu-examples.git",
+                                "webUILink": 
"https://github.com/odahu/odahu-examples";
+                            }
+                        }
+                    ],
+                    "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
+                    "opa_policies": {},
+                    "packager_version": 
"{}".format(odahu_conf['packager_version']),
+                    "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
+                    "service_accounts": {
+                        "airflow": {
+                            "client_id": "sa-airflow",
+                            "client_secret": 
"{}".format(odahu_conf['sa-airflow_secret'])
+                        },
+                        "operator": {
+                            "client_id": "sa-operator",
+                            "client_secret": 
"{}".format(odahu_conf['sa-operator_secret'])
+                        },
+                        "resource_uploader": {
+                            "client_id": "sa-resource-uploader",
+                            "client_secret": 
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+                        },
+                        "test": {
+                            "client_id": "sa-tester",
+                            "client_secret": 
"{}".format(odahu_conf['sa-tester_secret'])
+                        },
+                        "test_data_scientist": {
+                            "client_id": "sa-tester-data-scientist",
+                            "client_secret": 
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
+                        }
+                    },
+                    "service_cidr": "{}".format(odahu_conf['service_cidr']),
+                    "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
+                    "subnet_name": 
"{}".format(odahu_conf['private_subnet_name']),
+                    "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
+                    "tls_crt": "{}".format(odahu_conf['tls_crt']),
+                    "tls_key": "{}".format(odahu_conf['tls_key']),
+                    "vpc_name": "{}".format(odahu_conf['vpc_name']),
+                    "vault": {
+                        "enabled": true
                     }
-                    }
+            }
             profile.write(json.dumps(prof))
         local('cat /tmp/profile.json')
         local('cp /tmp/profile.json /')
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py 
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
index 2c811ec..751d4b2 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
@@ -49,7 +49,7 @@ if __name__ == "__main__":
     odahu_conf['node_locations'] = GCPMeta().get_available_zones()
     odahu_conf['dns_zone_name'] = os.environ['odahu_dns_zone_name']
     odahu_conf['docker_repo'] = os.environ['odahu_docker_repo']
-    odahu_conf['odahu_cidr'] = os.environ['odahu_cidr']
+    odahu_conf['cidr'] = os.environ['odahu_cidr']
     odahu_conf['service_base_name'] = 
(os.environ['conf_service_base_name']).lower().replace('_', '-')
     odahu_conf['project_name'] = 
(os.environ['project_name']).lower().replace('_', '-')
     odahu_conf['cluster_name'] = 
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
@@ -77,7 +77,7 @@ if __name__ == "__main__":
     odahu_conf['oauth_client_id'] = os.environ['keycloak_client_name']
     odahu_conf['oauth_client_secret'] = os.environ['keycloak_client_secret']
     odahu_conf['oauth_cookie_secret'] = os.environ['oauth_cookie_secret']
-    odahu_conf['odahu_infra_version'] = os.environ['odahu_infra_version']
+    odahu_conf['infra_version'] = os.environ['odahu_infra_version']
     odahu_conf['odahuflow_version'] = os.environ['odahu_odahuflow_version']
     odahu_conf['mlflow_toolchain_version'] = 
os.environ['odahu_mlflow_toolchain_version']
     odahu_conf['jupyterlab_version'] = os.environ['odahu_jupyterlab_version']
@@ -92,141 +92,194 @@ if __name__ == "__main__":
     odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
     odahu_conf['decrypt_token'] = 
os.environ['odahuflow_connection_decrypt_token']
     odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
+    odahu_conf['automation_version'] = os.environ['odahu_automation_version']
+    odahu_conf['ui_version'] = os.environ['odahu_ui_version']
+    odahu_conf['examples_version'] = os.environ['odahu_examples_version']
+    odahu_conf['jupyterhub_enabled'] = os.environ['odahu_jupyterhub_enabled']
+    odahu_conf['oauth_mesh_enabled'] = os.environ['odahu_oauth_mesh_enabled']
+    odahu_conf['keysecret'] = os.environ['odahu_keysecret']
+    odahu_conf['airflow_secret'] = os.environ['odahu_airflow_secret']
+    odahu_conf['operator_secret'] = os.environ['odahu_operator_secret']
+    odahu_conf['resource-uploader_secret'] = 
os.environ['odahu_resource_uploader_secret']
+    odahu_conf['tester_secret'] = os.environ['odahu_tester_secret']
+    odahu_conf['tester-data-scientist_secret'] = 
os.environ['odahu_tester_data_scientist_secret']
 
     print('Preparing parameters file')
     try:
         local("cp /root/templates/profile.json /tmp/")
         with open("/tmp/profile.json", 'w') as profile:
-            prof = {"allowed_ips": odahu_conf['allowed_cidr'],
-                    "cloud_type": "gcp",
-                    "cluster_name": "{}".format(odahu_conf['cluster_name']),
-                    "cluster_type": "gcp/gke",
-                    "cluster_context": "",
-                    "dns_zone_name": "{}".format(odahu_conf['dns_zone_name']),
-                    "docker_password": "",
-                    "docker_repo": "{}".format(odahu_conf['docker_repo']),
-                    "docker_user": "",
-                    "gcp_cidr": "{}".format(odahu_conf['odahu_cidr']),
-                    "gke_node_tag": 
"{}-gke-node".format(odahu_conf['cluster_name']).split(','),
-                    "grafana_admin": "{}".format(odahu_conf['grafana_admin']),
-                    "grafana_pass": "BMuYxTw6v5",
-                    "oauth_oidc_audience": "legion",
-                    "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
-                    "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
-                    "helm_repo": "{}".format(odahu_conf['helm_repo']),
-                    "odahu_infra_version": 
"{}".format(odahu_conf['odahu_infra_version']),
-                    "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
-                    "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
-                    "jupyterlab_version": 
"{}".format(odahu_conf['jupyterlab_version']),
-                    "packager_version": 
"{}".format(odahu_conf['packager_version']),
-                    "vpc_name": "{}".format(odahu_conf['vpc_name']),
-                    "subnet_name": 
"{}".format(odahu_conf['private_subnet_name']),
-                    "node_locations": odahu_conf['node_locations'],
-                    "node_labels": {
-                        "name": "{}".format(odahu_conf['cluster_name']),
-                        "product": "dlab",
-                        "user": "{}".format(odahu_conf['edge_user_name']),
-                        "sbn": "{}".format(odahu_conf['service_base_name'])
+            prof = {
+                "allowed_ips": odahu_conf['allowed_cidr'],
+                "authorization_enabled": "true",
+                "authz_dry_run": "false",
+                "cloud": {
+                    "gcp": {
+                        "node_locations": odahu_conf['node_locations'],
+                        "project_id": "{}".format(odahu_conf['project_id']),
+                        "region": "{}".format(odahu_conf['region']),
+                        "zone": "{}".format(odahu_conf['zone']),
                     },
-                    "oauth_client_id": 
"{}".format(odahu_conf['oauth_client_id']),
-                    "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
-                    "oauth_cookie_secret": "OWl6VnV3SHNIQzVyMThqVw==",
-                    "oauth_oidc_scope": "openid profile email offline_access 
groups",
-                    "oauth_oidc_host": 
"{}".format(odahu_conf['oauth_oidc_host']),
-                    "oauth_oidc_jwks_url": 
"https://idp.demo.dlabanalytics.com/auth/realms/dlab/protocol/openid-connect/certs";,
-                    "oauth_oidc_port": 443,
-                    "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
-                    "project_id": "{}".format(odahu_conf['project_id']),
-                    "region": "{}".format(odahu_conf['region']),
-                    "root_domain": "{}".format(odahu_conf['root_domain']),
-                    "service_cidr": "{}".format(odahu_conf['service_cidr']),
-                    "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
-                    "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
-                    "tls_crt": "{}".format(odahu_conf['tls_crt']),
-                    "tls_key": "{}".format(odahu_conf['tls_key']),
-                    "zone": "{}".format(odahu_conf['zone']),
-                    "dns_project_id": 
"{}".format(odahu_conf['dns_project_id']),
-                    "odahuflow_connection_decrypt_token": "qfY2k5bA2M",
-                    "authorization_enabled": "true",
-                    "authz_dry_run": "true",
-                    "github_org_name": "",
-                    "oauth_local_jwks": "",
-                    "oauth_mesh_enabled": "false",
-                    "k8s_version": "1.14.10-gke.17",
-                    "opa_policies": {
-                        "policy.rego": 
"cGFja2FnZSBvZGFodQoKIyByb2xlcy5yZWdvCgphZG1pbiA6PSAiYWRtaW4iCmRhdGFfc2NpZW50aXN0IDo9ICJkYXRhX3NjaWVudGlzdCIKCiMgcmJhYy5yZWdvCgpyYmFjIDo9IHsKCWRhdGFfc2NpZW50aXN0OiBbCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC9kZXBsb3ltZW50LioiXSwKICAgIAlbIioiLCAiYXBpL3YxL21vZGVsL3BhY2thZ2luZy4qIl0sCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC90cmFpbmluZy4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL2Nvbm5lY3Rpb24uKiJdLAogICAgCVsiUE9TVCIsICJhcGkvdjEvY29ubmVjdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3Yx
 [...]
-                    "node_pools": {
-                        "packaging": {
-                            "disk_size_gb": 64,
-                            "max_node_count": 3,
-                            "labels": {
-                                "mode": "odahu-flow-packaging"
-                            },
-                            "taints": [
-                                {
-                                    "value": "packaging",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-standard-4",
-                            "disk_type": "pd-ssd"
+                    "type": "gcp"
+                },
+                "cluster_name": "{}".format(odahu_conf['cluster_name']),
+                "cluster_type": "gcp/gke",
+                "data_bucket": 
"{}-data-bucket".format(odahu_conf['cluster_name']),
+
+                "dns": {
+                    "domain": "{}".format(odahu_conf['root_domain']),
+                    "gcp_project_id": "{}".format(odahu_conf['project_id']),
+                    "provider": "gcp",
+                    "zone_name": "{}".format(odahu_conf['dns_zone_name']),
+                },
+                "docker_password": "",
+                "docker_repo": "{}".format(odahu_conf['docker_repo']),
+                "docker_username": "",
+                "gcp_cidr": "{}".format(odahu_conf['cidr']),
+                "examples_version": 
"{}".format(odahu_conf['examples_version']),
+                "grafana_pass": "{}".format(odahu_conf['grafana_pass']),
+                "helm_repo": "{}".format(odahu_conf['helm_repo']),
+                "jupyterhub_enabled": odahu_conf['jupyterhub_enabled'],
+                "jupyterlab_version": 
"{}".format(odahu_conf['jupyterlab_version']),
+                "k8s_version": "{}".format(odahu_conf['k8s_version']),
+                "mlflow_toolchain_version": 
"{}".format(odahu_conf['mlflow_toolchain_version']),
+                "node_pools": {
+                    "main": {
+                        "disk_size_gb": 64,
+                        "init_node_count": 3,
+                        "max_node_count": 5,
+                        "min_node_count": 1
+                    },
+                    "model_deployment": {
+                        "labels": {
+                            "mode": "odahu-flow-deployment"
                         },
-                        "training": {
-                            "labels": {
-                                "mode": "odahu-flow-training"
-                            },
-                            "disk_size_gb": 100,
-                            "taints": [
-                                {
-                                    "value": "training",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-highcpu-8"
+                        "max_node_count": 3,
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "deployment"
+                            }
+                        ]
+                    },
+                    "packaging": {
+                        "disk_size_gb": 64,
+                        "disk_type": "pd-ssd",
+                        "labels": {
+                            "mode": "odahu-flow-packaging"
                         },
-                        "main": {
-                            "init_node_count": 3,
-                            "disk_size_gb": 64,
-                            "min_node_count": 1,
-                            "max_node_count": 5
+                        "machine_type": "n1-standard-4",
+                        "max_node_count": 3,
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "packaging"
+                            }
+                        ]
+                    },
+                    "training": {
+                        "disk_size_gb": 100,
+                        "labels": {
+                            "mode": "odahu-flow-training"
                         },
-                        "training_gpu": {
-                            "labels": {
-                                "mode": "odahu-flow-training-gpu"
-                            },
-                            "gpu": [
-                                {
-                                    "count": 2,
-                                    "type": "nvidia-tesla-p100"
-                                }
-                            ],
-                            "disk_size_gb": 100,
-                            "taints": [
-                                {
-                                    "value": "training-gpu",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "machine_type": "n1-standard-8"
+                        "machine_type": "n1-highcpu-8",
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "training"
+                            }
+                        ]
+                    },
+                    "training_gpu": {
+                        "disk_size_gb": 100,
+                        "gpu": [
+                            {
+                                "count": 2,
+                                "type": "nvidia-tesla-p100"
+                            }
+                        ],
+                        "labels": {
+                            "mode": "odahu-flow-training-gpu"
                         },
-                        "model_deployment": {
-                            "labels": {
-                                "mode": "odahu-flow-deployment"
-                            },
-                            "taints": [
-                                {
-                                    "value": "deployment",
-                                    "effect": "NO_SCHEDULE",
-                                    "key": "dedicated"
-                                }
-                            ],
-                            "max_node_count": 3
+                        "machine_type": "n1-standard-8",
+                        "taints": [
+                            {
+                                "effect": "NO_SCHEDULE",
+                                "key": "dedicated",
+                                "value": "training-gpu"
+                            }
+                        ]
+                    }
+                },
+                "oauth_client_id": "{}".format(odahu_conf['oauth_client_id']),
+                "oauth_client_secret": 
"{}".format(odahu_conf['oauth_client_secret']),
+                "oauth_cookie_secret": 
"{}".format(odahu_conf['oauth_cookie_secret']),
+                "oauth_local_jwks": "",
+                "oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
+                "oauth_oidc_audience": "legion",
+                "oauth_oidc_host": "{}".format(odahu_conf['oauth_oidc_host']),
+                "oauth_oidc_issuer_url": 
"{}".format(odahu_conf['oauth_oidc_issuer_url']),
+                "oauth_oidc_jwks_url": 
"{}/protocol/openid-connect/certs".format(odahu_conf['oauth_oidc_issuer_url']),
+                "oauth_oidc_port": 443,
+                "oauth_oidc_scope": "openid profile email offline_access 
groups",
+                "oauth_oidc_token_endpoint": 
"{}/protocol/openid-connect/token".format(
+                    odahu_conf['oauth_oidc_issuer_url']),
+                "odahu_automation_version": 
"{}".format(odahu_conf['automation_version']),
+                "odahu_infra_version": "{}".format(odahu_conf['nfra_version']),
+                "odahu_ui_version": "{}".format(odahu_conf['ui_version']),
+                "odahuflow_connection_decrypt_token": 
"{}".format(odahu_conf['decrypt_token']),
+                "odahuflow_connections": [
+                    {
+                        "id": "odahu-flow-examples",
+                        "spec": {
+                            "description": "Git repository with the Odahu-Flow 
examples",
+                            "keySecret": "{}".format(odahu_conf['keysecret']),
+                            "reference": 
"{}".format(odahu_conf['examples_version']),
+                            "type": "git",
+                            "uri": "[email protected]:odahu/odahu-examples.git",
+                            "webUILink": 
"https://github.com/odahu/odahu-examples";
                         }
                     }
+                ],
+                "odahuflow_version": 
"{}".format(odahu_conf['odahuflow_version']),
+                "opa_policies": {},
+                "packager_version": 
"{}".format(odahu_conf['packager_version']),
+                "pods_cidr": "{}".format(odahu_conf['pods_cidr']),
+                "service_accounts": {
+                    "airflow": {
+                        "client_id": "sa-airflow",
+                        "client_secret": 
"{}".format(odahu_conf['sa-airflow_secret'])
+                    },
+                    "operator": {
+                        "client_id": "sa-operator",
+                        "client_secret": 
"{}".format(odahu_conf['sa-operator_secret'])
+                    },
+                    "resource_uploader": {
+                        "client_id": "sa-resource-uploader",
+                        "client_secret": 
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+                    },
+                    "test": {
+                        "client_id": "sa-tester",
+                        "client_secret": 
"{}".format(odahu_conf['sa-tester_secret'])
+                    },
+                    "test_data_scientist": {
+                        "client_id": "sa-tester-data-scientist",
+                        "client_secret": 
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
                     }
+                },
+                "service_cidr": "{}".format(odahu_conf['service_cidr']),
+                "ssh_key": "{}".format(odahu_conf['ssh_key'].replace('\n', 
'')),
+                "subnet_name": "{}".format(odahu_conf['private_subnet_name']),
+                "tfstate_bucket": 
"{}-tfstate".format(odahu_conf['cluster_name']),
+                "tls_crt": "{}".format(odahu_conf['tls_crt']),
+                "tls_key": "{}".format(odahu_conf['tls_key']),
+                "vpc_name": "{}".format(odahu_conf['vpc_name']),
+                "vault": {
+                    "enabled": true
+                }
+            }
             profile.write(json.dumps(prof))
         local('cat /tmp/profile.json')
         local('cp /tmp/profile.json /')


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to