[odahu-integration] Bugfix
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py
index 37dfdaa..73eb9d7 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -123,7 +123,9 @@
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_docker_password', type=str, default='', help='Odahu private repository base64 encoded password')
parser.add_argument('--odahu_keysecret', type=str, default='', help='KeySecret for Odahuflow examples git')
+parser.add_argument('--odahu_oauth_local_jwks', type=str, default='', help='JWKS from keycloak')
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'
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 0dad5d8..77966ad 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -348,7 +348,7 @@
###
istio_helm_repo = https://storage.googleapis.com/istio-release/releases/1.2.2/charts
###
-k8s_version = 1.14.10-gke.24
+k8s_version = 1.14
###
helm_repo = https://raw.githubusercontent.com/odahu/odahu-helm/master
###
@@ -383,16 +383,20 @@
dns_project_id = or2-msq-epmc-dlab-t1iylu
###
infra_vpc_peering = 0
-###
-deploy_image = gcr.io/or2-msq-epmd-legn-t1iylu/odahu/odahu-flow-automation:1.1.0-rc8-dlab
+### Link to Odahuflow deploy image
+deploy_image = gcr.io/or2-msq-epmd-legn-t1iylu/odahu/odahu-flow-automation:1.1.0
###
opa_policy = cGFja2FnZSBvZGFodQoKIyByb2xlcy5yZWdvCgphZG1pbiA6PSAiYWRtaW4iCmRhdGFfc2NpZW50aXN0IDo9ICJkYXRhX3NjaWVudGlzdCIKCiMgcmJhYy5yZWdvCgpyYmFjIDo9IHsKCWRhdGFfc2NpZW50aXN0OiBbCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC9kZXBsb3ltZW50LioiXSwKICAgIAlbIioiLCAiYXBpL3YxL21vZGVsL3BhY2thZ2luZy4qIl0sCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC90cmFpbmluZy4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL2Nvbm5lY3Rpb24uKiJdLAogICAgCVsiUE9TVCIsICJhcGkvdjEvY29ubmVjdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL3BhY2thZ2luZy9pbnRlZ3JhdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL3Rvb2xjaGFpbi9pbnRlZ3JhdGlvbi4qIl0KICAgIF0sCiAgYWRtaW4gOiBbCiAgICAgIFsiLioiLCAiLioiXQogIF0KfQoKIyBpbnB1dF9tYXBwZXIKCnJvbGVzX21hcCA9IHsKCSJvZGFodV9hZG1pbiI6IGFkbWluLAogICAgIm9kYWh1X2RhdGFfc2NpZW50aXN0IjogZGF0YV9zY2llbnRpc3QKfQoKand0ID0gaW5wdXQuYXR0cmlidXRlcy5tZXRhZGF0YV9jb250ZXh0LmZpbHRlcl9tZXRhZGF0YVsiZW52b3kuZmlsdGVycy5odHRwLmp3dF9hdXRobiJdLmZpZWxkcy5qd3RfcGF5bG9hZAoKa2V5Y2xvYWtfdXNlcl9yb2xlc1tyb2xlXXsKCXJvbGUgPSBqd3QuS2luZC5TdHJ1Y3RWYWx1ZS5maWVsZHMucmVhbG1fYWNjZXNzLktpbmQuU3RydWN0VmFsdWUuZmllbGRzLnJvbGVzLktpbmQuTGlzdFZhbHVlLnZhbHVlc1tfXS5LaW5kLlN0cmluZ1ZhbHVlCn0KCnVzZXJfcm9sZXNbcm9sZV17Cglyb2xlID0gcm9sZXNfbWFwW2tleWNsb2FrX3VzZXJfcm9sZXNbX11dCn0KCgpwYXJzZWRfaW5wdXQgPSB7CgkiYWN0aW9uIjogaW5wdXQuYXR0cmlidXRlcy5yZXF1ZXN0Lmh0dHAubWV0aG9kLAogICJyZXNvdXJjZSI6IGlucHV0LmF0dHJpYnV0ZXMucmVxdWVzdC5odHRwLnBhdGgsCiAgInVzZXIiOiB7CiAgICAicm9sZXMiOiB1c2VyX3JvbGVzCiAgfQp9CgoKIyBjb3JlCgpkZWZhdWx0IGFsbG93ID0gZmFsc2UKYWxsb3cgewoJYW55X3VzZXJfcm9sZSA6PSBwYXJzZWRfaW5wdXQudXNlci5yb2xlc1tfXQogICAgYW55X3Blcm1pc3Npb25fb2ZfdXNlcl9yb2xlIDo9IHJiYWNbYW55X3VzZXJfcm9sZV1bX10KICAgIGFjdGlvbiA6PSBhbnlfcGVybWlzc2lvbl9vZl91c2VyX3JvbGVbMF0KICAgIHJlc291cmNlIDo9IGFueV9wZXJtaXNzaW9uX29mX3VzZXJfcm9sZVsxXQoKICAgIHJlX21hdGNoKGFjdGlvbiwgcGFyc2VkX2lucHV0LmFjdGlvbikKICAgIHJlX21hdGNoKHJlc291cmNlLCBwYXJzZWRfaW5wdXQucmVzb3VyY2UpCn0=
### TLS Certificate for Odahu cluster
# tls_crt =
### TLS Key for Odahu cluster
# tls_key =
+### Odahu private repository base64 encoded password
+# docker_password =
### KeySecret for Odahuflow examples git
# keysecret =
+### JWKS from keycloak
+# oauth_local_jwks =
### Airflow keycloak service account secret
# airflow_secret =
### Operator keycloak service account secret
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 6beef79..0277d43 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -67,6 +67,7 @@
odahu_conf['project_name'])
odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
odahu_conf['grafana_pass'] = id_generator()
+ odahu_conf['docker_password'] = base64.b64decode(os.environ['odahu_docker_password'] + "==")
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
odahu_conf['helm_repo'] = os.environ['odahu_helm_repo']
@@ -77,6 +78,7 @@
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['oauth_local_jwks'] = os.environ['odahu_oauth_local_jwks']
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']
@@ -131,9 +133,9 @@
"provider": "gcp",
"zone_name": "{}".format(odahu_conf['dns_zone_name']),
},
- "docker_password": "",
+ "docker_password": "{}".format(odahu_conf['docker_password']),
"docker_repo": "{}".format(odahu_conf['docker_repo']),
- "docker_username": "",
+ "docker_username": "_json_key",
"gcp_cidr": "{}".format(odahu_conf['cidr']),
"examples_version": "{}".format(odahu_conf['examples_version']),
"grafana_pass": "{}".format(odahu_conf['grafana_pass']),
@@ -216,7 +218,7 @@
"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_local_jwks": "{}".format(odahu_conf['oauth_local_jwks']),
"oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
"oauth_oidc_audience": "legion",
"oauth_oidc_host": "{}".format(odahu_conf['oauth_oidc_host']),
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py
index 5b9bf4f..1a6c3ab 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_prepare.py
@@ -43,13 +43,14 @@
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['endpoint_name'] = (os.environ['endpoint_name']).lower().replace('_', '-')
- odahu_conf['cluster_name'] = (os.environ['odahu_cluster_name']).lower().replace('_', '-')
+ odahu_conf['cluster_name'] = "{}-{}".format((os.environ['conf_service_base_name']).lower().replace('_', '-'),
+ (os.environ['odahu_cluster_name']).lower().replace('_', '-'))
odahu_conf['tag_name'] = '{}-tag'.format(odahu_conf['service_base_name'])
odahu_conf['endpoint_tag'] = (os.environ['endpoint_name']).lower().replace('_', '-')
odahu_conf['project_tag'] = (os.environ['project_name']).lower().replace('_', '-')
odahu_conf['region'] = os.environ['gcp_region']
- odahu_conf['bucket_name'] = "{}-tfstate".format((os.environ['odahu_cluster_name']).lower().replace('_', '-'))
- odahu_conf['static_address_name'] = "{}-nat-gw".format((os.environ['odahu_cluster_name']).lower().replace('_', '-'))
+ odahu_conf['bucket_name'] = "{}-tfstate".format(odahu_conf['cluster_name'])
+ odahu_conf['static_address_name'] = "{}-nat-gw".format(odahu_conf['cluster_name'])
odahu_conf['keycloak_auth_server_url'] = os.environ['keycloak_auth_server_url']
odahu_conf['keycloak_realm_name'] = os.environ['keycloak_realm_name']
odahu_conf['keycloak_client_name'] = os.environ['keycloak_client_name']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index ffddc19..994828b 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -69,6 +69,7 @@
odahu_conf['project_name'])
odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
+ odahu_conf['docker_password'] = base64.b64decode(os.environ['odahu_docker_password'] + "==")
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
odahu_conf['helm_repo'] = os.environ['odahu_helm_repo']
@@ -79,6 +80,7 @@
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['oauth_local_jwks'] = os.environ['odahu_oauth_local_jwks']
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']
@@ -133,9 +135,9 @@
"provider": "gcp",
"zone_name": "{}".format(odahu_conf['dns_zone_name']),
},
- "docker_password": "",
+ "docker_password": "{}".format(odahu_conf['docker_password']),
"docker_repo": "{}".format(odahu_conf['docker_repo']),
- "docker_username": "",
+ "docker_username": "_json_key",
"gcp_cidr": "{}".format(odahu_conf['cidr']),
"examples_version": "{}".format(odahu_conf['examples_version']),
"grafana_pass": "{}".format(odahu_conf['grafana_pass']),
@@ -147,7 +149,7 @@
"node_pools": {
"main": {
"disk_size_gb": 64,
- "init_node_count": 3,
+ "init_node_count": 8,
"max_node_count": 5,
"min_node_count": 1
},
@@ -218,7 +220,7 @@
"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_local_jwks": "{}".format(odahu_conf['oauth_local_jwks']),
"oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
"oauth_oidc_audience": "legion",
"oauth_oidc_host": "{}".format(odahu_conf['oauth_oidc_host']),
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index f38b4b5..54aff9e 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
@@ -67,6 +67,7 @@
odahu_conf['project_name'])
odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
+ odahu_conf['docker_password'] = base64.b64decode(os.environ['odahu_docker_password'] + "==")
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
odahu_conf['helm_repo'] = os.environ['odahu_helm_repo']
@@ -77,6 +78,7 @@
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['oauth_local_jwks'] = os.environ['odahu_oauth_local_jwks']
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']
@@ -131,9 +133,9 @@
"provider": "gcp",
"zone_name": "{}".format(odahu_conf['dns_zone_name']),
},
- "docker_password": "",
+ "docker_password": "{}".format(odahu_conf['docker_password']),
"docker_repo": "{}".format(odahu_conf['docker_repo']),
- "docker_username": "",
+ "docker_username": "_json_key",
"gcp_cidr": "{}".format(odahu_conf['cidr']),
"examples_version": "{}".format(odahu_conf['examples_version']),
"grafana_pass": "{}".format(odahu_conf['grafana_pass']),
@@ -216,7 +218,7 @@
"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_local_jwks": "{}".format(odahu_conf['oauth_local_jwks']),
"oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
"oauth_oidc_audience": "legion",
"oauth_oidc_host": "{}".format(odahu_conf['oauth_oidc_host']),
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
index f48b064..c964ce3 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
@@ -68,6 +68,7 @@
odahu_conf['project_name'])
odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
+ odahu_conf['docker_password'] = base64.b64decode(os.environ['odahu_docker_password'] + "==")
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
odahu_conf['helm_repo'] = os.environ['odahu_helm_repo']
@@ -78,6 +79,7 @@
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['oauth_local_jwks'] = os.environ['odahu_oauth_local_jwks']
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']
@@ -132,9 +134,9 @@
"provider": "gcp",
"zone_name": "{}".format(odahu_conf['dns_zone_name']),
},
- "docker_password": "",
+ "docker_password": "{}".format(odahu_conf['docker_password']),
"docker_repo": "{}".format(odahu_conf['docker_repo']),
- "docker_username": "",
+ "docker_username": "_json_key",
"gcp_cidr": "{}".format(odahu_conf['cidr']),
"examples_version": "{}".format(odahu_conf['examples_version']),
"grafana_pass": "{}".format(odahu_conf['grafana_pass']),
@@ -217,7 +219,7 @@
"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_local_jwks": "{}".format(odahu_conf['oauth_local_jwks']),
"oauth_mesh_enabled": odahu_conf['oauth_mesh_enabled'],
"oauth_oidc_audience": "legion",
"oauth_oidc_host": "{}".format(odahu_conf['oauth_oidc_host']),
