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 8176f1f  [odahu-integration] Bugfix
     new 2b1ae93  Merge remote-tracking branch 'origin/odahu-integration' into 
odahu-integration
8176f1f is described below

commit 8176f1f8c868e4bde355bc3e56c82120c8760430
Author: Demyan Mysakovets <[email protected]>
AuthorDate: Wed Apr 8 13:01:13 2020 +0300

    [odahu-integration] Bugfix
---
 infrastructure-provisioning/scripts/deploy_dlab.py             |  2 ++
 infrastructure-provisioning/src/general/conf/dlab.ini          | 10 +++++++---
 .../src/general/scripts/gcp/odahu_deploy.py                    |  8 +++++---
 .../src/general/scripts/gcp/odahu_prepare.py                   |  7 ++++---
 .../src/general/scripts/gcp/odahu_resume.py                    | 10 ++++++----
 .../src/general/scripts/gcp/odahu_suspend.py                   |  8 +++++---
 .../src/general/scripts/gcp/odahu_terminate.py                 |  8 +++++---
 7 files changed, 34 insertions(+), 19 deletions(-)

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('--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_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 @@ initial_node_count = 6
 ###
 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 @@ service_cidr = 10.42.128.0/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 = 
cGFja2FnZSBvZGFodQoKIyByb2xlcy5yZWdvCgphZG1pbiA6PSAiYWRtaW4iCmRhdGFfc2NpZW50aXN0IDo9ICJkYXRhX3NjaWVudGlzdCIKCiMgcmJhYy5yZWdvCgpyYmFjIDo9IHsKCWRhdGFfc2NpZW50aXN0OiBbCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC9kZXBsb3ltZW50LioiXSwKICAgIAlbIioiLCAiYXBpL3YxL21vZGVsL3BhY2thZ2luZy4qIl0sCiAgICAJWyIqIiwgImFwaS92MS9tb2RlbC90cmFpbmluZy4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL2Nvbm5lY3Rpb24uKiJdLAogICAgCVsiUE9TVCIsICJhcGkvdjEvY29ubmVjdGlvbi4qIl0sCiAgICAJWyJHRVQiLCAiYXBpL3YxL3BhY2thZ2luZy9pbnRlZ3JhdGl
 [...]
 ### 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 @@ if __name__ == "__main__":
                                                                 
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 @@ 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['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 @@ if __name__ == "__main__":
                         "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 @@ if __name__ == "__main__":
                     "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 @@ if __name__ == "__main__":
     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 @@ if __name__ == "__main__":
                                                                 
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 @@ 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['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 @@ if __name__ == "__main__":
                     "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 @@ if __name__ == "__main__":
                 "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 @@ if __name__ == "__main__":
                 "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 @@ if __name__ == "__main__":
                                                                 
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 @@ 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['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 @@ if __name__ == "__main__":
                         "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 @@ if __name__ == "__main__":
                     "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 @@ if __name__ == "__main__":
                                                                 
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 @@ 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['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 @@ if __name__ == "__main__":
                     "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 @@ if __name__ == "__main__":
                 "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']),


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

Reply via email to