You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/09/24 14:48:02 UTC
[incubator-dlab] branch DLAB-1911 updated: [DLAB-1911]: changed how
network tags are passed
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1911
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1911 by this push:
new 6cbdfdd [DLAB-1911]: changed how network tags are passed
6cbdfdd is described below
commit 6cbdfdde85f13796a79a1e1bf3f06ab43d174bf8
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Sep 24 17:47:48 2020 +0300
[DLAB-1911]: changed how network tags are passed
---
.../src/general/lib/gcp/actions_lib.py | 2 +-
.../src/general/scripts/gcp/common_prepare_notebook.py | 4 ++--
.../src/general/scripts/gcp/dataengine_prepare.py | 4 ++--
.../src/general/scripts/gcp/project_prepare.py | 12 ++++++------
.../src/general/scripts/gcp/ssn_prepare.py | 8 ++++----
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 0849201..4001d7d 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -460,7 +460,7 @@ class GCPActions:
request = self.service.instances().get(instance=instance_name, project=self.project,
zone=zone)
res = request.execute()
- instance_tag = {"items": [network_tag, "datalab"], "fingerprint": res['tags']['fingerprint']}
+ instance_tag = {"items": network_tag, "fingerprint": res['tags']['fingerprint']}
request = self.service.instances().setTags(instance=instance_name, project=self.project,
zone=zone,
body=instance_tag)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index dcba179..0de9aea 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -146,9 +146,9 @@ if __name__ == "__main__":
if os.environ['application'] in ('tensor', 'tensor-rstudio', 'deeplearning'):
notebook_config['gpu_accelerator_type'] = os.environ['gcp_gpu_accelerator_type']
- notebook_config['network_tag'] = '{0}-{1}-{2}-ps'.format(notebook_config['service_base_name'],
+ notebook_config['network_tag'] = ['{0}-{1}-{2}-ps'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
- notebook_config['endpoint_name'])
+ notebook_config['endpoint_name'])]
with open('/root/result.json', 'w') as f:
data = {"notebook_name": notebook_config['instance_name'], "error": ""}
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
index 262868c..305e83f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
@@ -150,8 +150,8 @@ if __name__ == "__main__":
data_engine['gpu_accelerator_type'] = 'None'
if os.environ['application'] in ('tensor', 'tensor-rstudio', 'deeplearning'):
data_engine['gpu_accelerator_type'] = os.environ['gcp_gpu_accelerator_type']
- data_engine['network_tag'] = '{0}-{1}-{2}-ps'.format(data_engine['service_base_name'],
- data_engine['project_name'], data_engine['endpoint_name'])
+ data_engine['network_tag'] = ['{0}-{1}-{2}-ps'.format(data_engine['service_base_name'],
+ data_engine['project_name'], data_engine['endpoint_name'])]
additional_tags = os.environ['tags'].replace("': u'", ":").replace("', u'", ",").replace("{u'", "").replace(
"'}", "").lower()
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index ae9aa24..7129e15 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -115,7 +115,7 @@ if __name__ == "__main__":
project_conf['fw_ps_ingress'] = '{}-sg-ingress'.format(project_conf['fw_common_name'])
project_conf['fw_ps_egress_private'] = '{}-sg-egress-private'.format(project_conf['fw_common_name'])
project_conf['fw_ps_egress_public'] = '{}-sg-egress-public'.format(project_conf['fw_common_name'])
- project_conf['network_tag'] = project_conf['instance_name']
+ project_conf['network_tag'] = [project_conf['instance_name'], "edge", "datalab"]
project_conf['instance_labels'] = {"name": project_conf['instance_name'],
"sbn": project_conf['service_base_name'],
"project_tag": project_conf['project_tag'],
@@ -231,7 +231,7 @@ if __name__ == "__main__":
ingress_rule = dict()
ingress_rule['name'] = project_conf['fw_edge_ingress_public']
- ingress_rule['targetTags'] = [project_conf['network_tag']]
+ ingress_rule['targetTags'] = [project_conf['network_tag'][0]]
ingress_rule['sourceRanges'] = [project_conf['allowed_ip_cidr']]
rules = [
{
@@ -246,7 +246,7 @@ if __name__ == "__main__":
ingress_rule = dict()
ingress_rule['name'] = project_conf['fw_edge_ingress_internal']
- ingress_rule['targetTags'] = [project_conf['network_tag']]
+ ingress_rule['targetTags'] = [project_conf['network_tag'][0]]
ingress_rule['sourceRanges'] = [project_conf['private_subnet_cidr']]
rules = [
{
@@ -260,7 +260,7 @@ if __name__ == "__main__":
egress_rule = dict()
egress_rule['name'] = project_conf['fw_edge_egress_public']
- egress_rule['targetTags'] = [project_conf['network_tag']]
+ egress_rule['targetTags'] = [project_conf['network_tag'][0]]
egress_rule['destinationRanges'] = [project_conf['allowed_ip_cidr']]
rules = [
{
@@ -279,7 +279,7 @@ if __name__ == "__main__":
egress_rule = dict()
egress_rule['name'] = project_conf['fw_edge_egress_internal']
- egress_rule['targetTags'] = [project_conf['network_tag']]
+ egress_rule['targetTags'] = [project_conf['network_tag'][0]]
egress_rule['destinationRanges'] = [project_conf['private_subnet_cidr']]
rules = [
{
@@ -510,7 +510,7 @@ if __name__ == "__main__":
print('[CREATE EDGE INSTANCE]')
params = "--instance_name {} --region {} --zone {} --vpc_name {} --subnet_name {} --instance_size {} " \
"--ssh_key_path {} --initial_user {} --service_account_name {} --image_name {} --instance_class {} " \
- "--static_ip {} --network_tag '\"{}\", \"edge\"' --labels '{}' --service_base_name {}".format(
+ "--static_ip {} --network_tag {} --labels '{}' --service_base_name {}".format(
project_conf['instance_name'], project_conf['region'], project_conf['zone'], project_conf['vpc_name'],
project_conf['subnet_name'], project_conf['instance_size'], project_conf['ssh_key_path'],
project_conf['initial_user'], project_conf['edge_service_account_name'], project_conf['image_name'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
index 11befa9..b2b2ada 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
@@ -71,7 +71,7 @@ if __name__ == "__main__":
ssn_conf['static_address_name'] = '{}-ssn-static-ip'.format(ssn_conf['service_base_name'])
ssn_conf['ssn_policy_path'] = '/root/files/ssn_policy.json'
ssn_conf['ssn_roles_path'] = '/root/files/ssn_roles.json'
- ssn_conf['network_tag'] = ssn_conf['instance_name']
+ ssn_conf['network_tag'] = [ssn_conf['instance_name'], "ssn", "datalab"]
ssn_conf['instance_labels'] = {"name": ssn_conf['instance_name'],
"sbn": ssn_conf['service_base_name'],
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
@@ -159,7 +159,7 @@ if __name__ == "__main__":
ingress_rule = dict()
ingress_rule['name'] = '{}-ingress'.format(ssn_conf['firewall_name'])
- ingress_rule['targetTags'] = [ssn_conf['network_tag']]
+ ingress_rule['targetTags'] = [ssn_conf['network_tag'][0]]
ingress_rule['sourceRanges'] = [ssn_conf['allowed_ip_cidr']]
rules = [
{
@@ -174,7 +174,7 @@ if __name__ == "__main__":
egress_rule = dict()
egress_rule['name'] = '{}-egress'.format(ssn_conf['firewall_name'])
- egress_rule['targetTags'] = [ssn_conf['network_tag']]
+ egress_rule['targetTags'] = [ssn_conf['network_tag'][0]]
egress_rule['destinationRanges'] = [ssn_conf['allowed_ip_cidr']]
rules = [
{
@@ -271,7 +271,7 @@ if __name__ == "__main__":
print('[CREATE SSN INSTANCE]')
params = "--instance_name {0} --region {1} --zone {2} --vpc_name {3} --subnet_name {4} --instance_size {5}"\
" --ssh_key_path {6} --initial_user {7} --service_account_name {8} --image_name {9}"\
- " --instance_class {10} --static_ip {11} --network_tag '\"{12}\", \"ssn\"' --labels '{13}' " \
+ " --instance_class {10} --static_ip {11} --network_tag {12} --labels '{13}' " \
"--primary_disk_size {14} --service_base_name {15}".\
format(ssn_conf['instance_name'], ssn_conf['region'], ssn_conf['zone'], ssn_conf['vpc_name'],
ssn_conf['subnet_name'], ssn_conf['instance_size'], ssn_conf['ssh_key_path'],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org