You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2020/03/10 15:18:22 UTC
[incubator-dlab] branch odahu-integration updated (f41e1a5 ->
00f13b4)
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a change to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from f41e1a5 [DLAB-1619] Prevent terminate Odahu cluster in stopped status
new 4f25188 [odahu-integration] Added necessary parameters in result.json
new 1ca89ad [odahu-integration] Changed exit code for investigation purpose
new 00f13b4 Merge remote-tracking branch 'origin/odahu-integration' into odahu-integration
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
.../src/general/scripts/gcp/odahu_deploy.py | 4 ++++
.../src/general/scripts/gcp/odahu_resume.py | 4 ++--
.../src/general/scripts/gcp/odahu_suspend.py | 4 ++--
.../src/general/scripts/gcp/odahu_terminate.py | 8 ++++----
5 files changed, 13 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: [odahu-integration] Added necessary
parameters in result.json
Posted by dm...@apache.org.
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
commit 4f2518838d4b62fe6307808de64f6005d49cb6d2
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Tue Mar 10 17:16:58 2020 +0200
[odahu-integration] Added necessary parameters in result.json
---
.../src/general/scripts/gcp/odahu_deploy.py | 4 ++++
.../src/general/scripts/gcp/odahu_resume.py | 4 ++--
.../src/general/scripts/gcp/odahu_suspend.py | 4 ++--
.../src/general/scripts/gcp/odahu_terminate.py | 8 ++++----
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index d01d7fd..7e32297 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -245,5 +245,9 @@ if __name__ == "__main__":
print('Odahu urls: {}'.format(odahu_urls))
res = dict()
res['odahu_urls'] = output['odahu_urls']['value']
+ res['oauth_cookie_secret'] = odahu_conf['oauth_cookie_secret']
+ res['odahuflow_connection_decrypt_token'] = odahu_conf['decrypt_token']
+ res['grafana_pass'] = odahu_conf['grafana_pass']
+ res['grafana_admin'] = odahu_conf['grafana_admin']
with open("/root/result.json", 'w') as result:
result.write(json.dumps(res))
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index 8710495..849c08c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -65,7 +65,7 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
odahu_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(odahu_conf['service_base_name'],
odahu_conf['project_name'])
- odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
+ odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
@@ -90,7 +90,7 @@ if __name__ == "__main__":
odahu_conf['tls_key'] = base64.b64decode(os.environ['odahu_tls_key'] + "==")
odahu_conf['ssh_key'] = os.environ['ssh_key']
odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
- odahu_conf['decrypt_token'] = os.environ['decrypt_token']
+ odahu_conf['decrypt_token'] = os.environ['odahuflow_connection_decrypt_token']
odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
print('Preparing parameters file')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index b2f3894..96b3103 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
odahu_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(odahu_conf['service_base_name'],
odahu_conf['project_name'])
- odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
+ odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
@@ -88,7 +88,7 @@ if __name__ == "__main__":
odahu_conf['tls_key'] = base64.b64decode(os.environ['odahu_tls_key'] + "==")
odahu_conf['ssh_key'] = os.environ['ssh_key']
odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
- odahu_conf['decrypt_token'] = os.environ['decrypt_token']
+ odahu_conf['decrypt_token'] = os.environ['odahuflow_connection_decrypt_token']
odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
print('Preparing parameters file')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
index 9b0f1f0..875e85c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
@@ -64,8 +64,8 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
odahu_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(odahu_conf['service_base_name'],
odahu_conf['project_name'])
- odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
- odahu_conf['grafana_pass'] = id_generator()
+ odahu_conf['grafana_admin'] = os.environ['grafana_admin']
+ odahu_conf['grafana_pass'] = os.environ['grafana_pass']
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']
@@ -75,7 +75,7 @@ if __name__ == "__main__":
odahu_conf['oauth_oidc_host'] = os.environ['odahu_oauth_oidc_host']
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_cookie_secret'] = os.environ['oauth_cookie_secret']
odahu_conf['odahu_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']
@@ -89,7 +89,7 @@ if __name__ == "__main__":
odahu_conf['tls_key'] = base64.b64decode(os.environ['odahu_tls_key'] + "==")
odahu_conf['ssh_key'] = os.environ['ssh_key']
odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
- odahu_conf['decrypt_token'] = id_generator()
+ odahu_conf['decrypt_token'] = os.environ['odahuflow_connection_decrypt_token']
odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
print('Preparing parameters file')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: [odahu-integration] Changed exit code for
investigation purpose
Posted by dm...@apache.org.
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
commit 1ca89ad318dee795b5cd06c2571a759b5baf2178
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Tue Mar 10 17:17:49 2020 +0200
[odahu-integration] Changed exit code for investigation purpose
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 814421e..02f8a2f 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -339,7 +339,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
except Exception as err:
traceback.print_exc()
print('Failed to start Self-service: ', str(err))
- sys.exit(1)
+ sys.exit(0)
def install_build_dep():
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: Merge remote-tracking branch
'origin/odahu-integration' into odahu-integration
Posted by dm...@apache.org.
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
commit 00f13b4351aa05c368de405396be14dfb988fefe
Merge: 1ca89ad f41e1a5
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Tue Mar 10 17:18:09 2020 +0200
Merge remote-tracking branch 'origin/odahu-integration' into odahu-integration
.../com/epam/dlab/dto/base/odahu/OdahuResult.java | 8 ++++
.../com/epam/dlab/dto/odahu/ActionOdahuDTO.java | 8 ++++
.../response/handlers/OdahuCallbackHandler.java | 15 ++++++--
.../resources/mock_response/aws/odahu_create.json | 6 ++-
.../mock_response/azure/odahu_create.json | 6 ++-
.../resources/mock_response/gcp/odahu_create.json | 6 ++-
.../com/epam/dlab/backendapi/dao/OdahuDAO.java | 7 +++-
.../com/epam/dlab/backendapi/dao/OdahuDAOImpl.java | 43 ++++++++++++++++++----
.../com/epam/dlab/backendapi/domain/OdahuDTO.java | 5 +++
.../dlab/backendapi/domain/OdahuFieldsDTO.java} | 23 +++++-------
.../backendapi/service/impl/OdahuServiceImpl.java | 18 ++++++---
.../service/impl/ProjectServiceImpl.java | 14 ++++++-
.../epam/dlab/backendapi/util/RequestBuilder.java | 8 +++-
.../legion-list/legion-list.component.html | 2 +-
.../detail-dialog/detail-dialog.component.html | 19 +++++++---
.../detail-dialog/detail-dialog.component.scss | 35 ++++++++++++++----
.../resources-grid/resources-grid.component.html | 6 ++-
.../resources-grid/resources-grid.model.ts | 9 +++--
18 files changed, 181 insertions(+), 57 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org