You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2022/10/28 13:52:13 UTC
[incubator-datalab] branch epm-v2.5.2.1 updated (8723bd2e8 -> dcfd333cd)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
from 8723bd2e8 [DATALAB-3096]: moved tag to variable in datalab.ini
new a348e17d3 added network tag
new dcfd333cd added region check for subnet
The 2 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/gcp/actions_lib.py | 6 +++---
.../src/general/scripts/gcp/common_create_subnet.py | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: added region check for subnet
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit dcfd333cdb17aecb7cf8d30bb1c1002076189653
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Oct 28 16:52:02 2022 +0300
added region check for subnet
---
.../src/general/scripts/gcp/common_create_subnet.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py
index 1153aad62..ca0f70da7 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_subnet.py
@@ -50,7 +50,8 @@ if __name__ == "__main__":
empty_vpc = True
subnets = []
for subnet in subnets:
- subnets_cidr.append(GCPMeta().get_subnet(subnet.split('/')[-1], args.region)['ipCidrRange'])
+ if args.region in subnet:
+ subnets_cidr.append(GCPMeta().get_subnet(subnet.split('/')[-1], args.region)['ipCidrRange'])
sortkey = lambda addr: \
(int(addr.split("/")[0].split(".")[0]),
int(addr.split("/")[0].split(".")[1]),
@@ -103,7 +104,8 @@ if __name__ == "__main__":
existed_subnet_list = []
response = GCPMeta().get_vpc(args.vpc_selflink.split('/')[-1])['subnetworks']
for subnet in response:
- existed_subnet_list.append(GCPMeta().get_subnet(subnet.split('/')[-1], args.region)['ipCidrRange'])
+ if args.region in subnet:
+ existed_subnet_list.append(GCPMeta().get_subnet(subnet.split('/')[-1], args.region)['ipCidrRange'])
available_subnets = list(set(pre_defined_subnet_list) - set(existed_subnet_list))
if not available_subnets:
logging.info("There is no available subnet to create. Aborting...")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: added network tag
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a348e17d372ed85c1146b41d0dfb85e2e9f381b1
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Oct 28 16:51:22 2022 +0300
added network tag
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index b0733b847..2ccf95071 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -493,11 +493,11 @@ class GCPActions:
zone=zone)
res = request.execute()
if 'ssn' in network_tag:
- instance_tag = {"items": [network_tag, "datalab", "ssn"], "fingerprint": res['tags']['fingerprint']}
+ instance_tag = {"items": [network_tag, "datalab", "ssn", "datalab-deploy-22"], "fingerprint": res['tags']['fingerprint']}
elif 'edge' in network_tag:
- instance_tag = {"items": [network_tag, "datalab", "edge"], "fingerprint": res['tags']['fingerprint']}
+ instance_tag = {"items": [network_tag, "datalab", "edge", "datalab-deploy-22"], "fingerprint": res['tags']['fingerprint']}
else:
- instance_tag = {"items": [network_tag, "datalab"], "fingerprint": res['tags']['fingerprint']}
+ instance_tag = {"items": [network_tag, "datalab", "datalab-deploy-22"], "fingerprint": res['tags']['fingerprint']}
request = self.service.instances().setTags(instance=instance_name, project=self.project,
zone=zone,
body=instance_tag)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org