From 19c268bdaa195450573de5d5df70f72a81c428ea Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Fri, 21 Jun 2024 15:09:50 +0100 Subject: [PATCH 1/2] Add extra CDW create cluster method Signed-off-by: Jim Enright --- src/cdpy/dw.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cdpy/dw.py b/src/cdpy/dw.py index a27bfe5..3d41d87 100644 --- a/src/cdpy/dw.py +++ b/src/cdpy/dw.py @@ -118,7 +118,9 @@ def create_cluster(self, env_crn: str, overlay: bool, aws_lb_subnets: list = Non aws_worker_subnets: list = None, az_subnet: str = None, az_enable_az: bool = None, az_managed_identity: str = None, az_enable_private_aks: bool = None, az_enable_private_sql: bool = None, az_enable_spot_instances: bool = None, az_log_analytics_workspace_id: str = None, az_network_outbound_type: str = None, - az_aks_private_dns_zone: str = None, az_compute_instance_types: list = None, private_load_balancer: bool = None): + az_aks_private_dns_zone: str = None, az_compute_instance_types: list = None, private_load_balancer: bool = None, + public_worker_node: bool = None + ): self.sdk.validate_crn(env_crn) if all(x is not None for x in [aws_worker_subnets, aws_lb_subnets]): aws_options = dict(lbSubnetIds=aws_lb_subnets, @@ -138,7 +140,7 @@ def create_cluster(self, env_crn: str, overlay: bool, aws_lb_subnets: list = Non return self.sdk.call( svc='dw', func='create_cluster', ret_field='clusterId', environmentCrn=env_crn, useOverlayNetwork=overlay, usePrivateLoadBalancer=private_load_balancer, - awsOptions=aws_options, azureOptions=azure_options, squelch=[ + usePublicWorkerNode=public_worker_node, awsOptions=aws_options, azureOptions=azure_options, squelch=[ Squelch(value='PATH_DISABLED', warning=ENTITLEMENT_DISABLED) ] ) From 64970e4cc4912312d17fc1694217cc349cfab788 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Tue, 25 Jun 2024 17:35:15 +0100 Subject: [PATCH 2/2] Add extra CDW create cluster method Signed-off-by: Jim Enright --- src/cdpy/dw.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cdpy/dw.py b/src/cdpy/dw.py index 3d41d87..1fdc9ac 100644 --- a/src/cdpy/dw.py +++ b/src/cdpy/dw.py @@ -119,7 +119,9 @@ def create_cluster(self, env_crn: str, overlay: bool, aws_lb_subnets: list = Non az_managed_identity: str = None, az_enable_private_aks: bool = None, az_enable_private_sql: bool = None, az_enable_spot_instances: bool = None, az_log_analytics_workspace_id: str = None, az_network_outbound_type: str = None, az_aks_private_dns_zone: str = None, az_compute_instance_types: list = None, private_load_balancer: bool = None, - public_worker_node: bool = None + public_worker_node: bool = None, custom_subdomain: str = None, database_backup_retention_period: int = None, + reserved_compute_nodes: int = None, reserved_shared_services_nodes: int = None, resource_pool: str = None, + lb_ip_ranges: list = None, k8s_ip_ranges: list = None ): self.sdk.validate_crn(env_crn) if all(x is not None for x in [aws_worker_subnets, aws_lb_subnets]): @@ -140,7 +142,11 @@ def create_cluster(self, env_crn: str, overlay: bool, aws_lb_subnets: list = Non return self.sdk.call( svc='dw', func='create_cluster', ret_field='clusterId', environmentCrn=env_crn, useOverlayNetwork=overlay, usePrivateLoadBalancer=private_load_balancer, - usePublicWorkerNode=public_worker_node, awsOptions=aws_options, azureOptions=azure_options, squelch=[ + usePublicWorkerNode=public_worker_node, awsOptions=aws_options, azureOptions=azure_options, + customSubdomain=custom_subdomain, databaseBackupRetentionPeriod=database_backup_retention_period, + reservedComputeNodes=reserved_compute_nodes, reservedSharedServicesNodes=reserved_shared_services_nodes, + resourcePool=resource_pool, whitelistK8sClusterAccessIpCIDRs=k8s_ip_ranges, whitelistWorkloadAccessIpCIDRs=lb_ip_ranges, + squelch=[ Squelch(value='PATH_DISABLED', warning=ENTITLEMENT_DISABLED) ] )