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 1497a08 [odahu-integration] Bugfix
new 8e17faf Merge remote-tracking branch 'origin/odahu-integration' into
odahu-integration
1497a08 is described below
commit 1497a081c07af0e9d530011e2f5028b1b40be7c5
Author: Demyan Mysakovets <[email protected]>
AuthorDate: Wed Mar 18 18:41:22 2020 +0200
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/files/gcp/ssn_roles.json | 3 ++-
.../src/general/scripts/gcp/odahu_deploy.py | 7 +++++++
.../src/general/scripts/gcp/odahu_resume.py | 3 ++-
.../src/general/scripts/gcp/odahu_suspend.py | 1 +
.../src/general/scripts/gcp/odahu_terminate.py | 7 +++++++
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
b/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
index 4da449f..3a72260 100644
--- a/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
+++ b/infrastructure-provisioning/src/general/files/gcp/ssn_roles.json
@@ -8,5 +8,6 @@
"compute.instanceAdmin",
"bigquery.dataViewer",
"bigquery.jobUser",
- "container.admin"
+ "container.admin",
+ "dns.admin"
]
\ No newline at end of file
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 07d1f5c..396fd38 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -44,6 +44,7 @@ if __name__ == "__main__":
odahu_conf['project_id'] = (os.environ['gcp_project_id'])
odahu_conf['region'] = (os.environ['gcp_region'])
odahu_conf['zone'] = (os.environ['gcp_zone'])
+ odahu_conf['edge_user_name'] = os.environ['edge_user_name']
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']
@@ -120,6 +121,12 @@ if __name__ == "__main__":
"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==",
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index e1b9536..a74cdd5 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -46,13 +46,14 @@ if __name__ == "__main__":
odahu_conf['project_id'] = (os.environ['gcp_project_id'])
odahu_conf['region'] = (os.environ['gcp_region'])
odahu_conf['zone'] = (os.environ['gcp_zone'])
+ odahu_conf['edge_user_name'] = os.environ['edge_user_name']
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['service_base_name'] =
(os.environ['conf_service_base_name']).lower().replace('_', '-')
odahu_conf['project_name'] =
(os.environ['project_name']).lower().replace('_', '-')
- odahu_conf['odahu_cluster_name'] =
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
+ odahu_conf['cluster_name'] =
(os.environ['odahu_cluster_name']).lower().replace('_', '-')
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('_', '-'))
try:
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index b96c15e..4736e02 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
@@ -44,6 +44,7 @@ if __name__ == "__main__":
odahu_conf['project_id'] = (os.environ['gcp_project_id'])
odahu_conf['region'] = (os.environ['gcp_region'])
odahu_conf['zone'] = (os.environ['gcp_zone'])
+ odahu_conf['edge_user_name'] = os.environ['edge_user_name']
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']
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
index b37a734..2c811ec 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
@@ -45,6 +45,7 @@ if __name__ == "__main__":
odahu_conf['project_id'] = (os.environ['gcp_project_id'])
odahu_conf['region'] = (os.environ['gcp_region'])
odahu_conf['zone'] = (os.environ['gcp_zone'])
+ odahu_conf['edge_user_name'] = os.environ['edge_user_name']
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']
@@ -121,6 +122,12 @@ if __name__ == "__main__":
"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==",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]