Skip to content

Commit d60279f

Browse files
authored
feat: DA updates:<br>- The "Fully configurable" variation now deploys a cluster with a public endpoint enabled by default. This can be toggled using the disable_public_service_endpoint input.<br>- If VPC DA is selected (it is by default), there is now an option to configure the network ACLs. By default, it will create ACLs to allow public (port 80 and 443) so the Openshift console can be reached.(#740)
1 parent f12fb46 commit d60279f

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ibm_catalog.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,14 @@
739739
"required": false,
740740
"virtual": true
741741
},
742+
{
743+
"key": "network_acls",
744+
"type": "array",
745+
"default_value": "[\n {\n name = \"vpc-acl\"\n add_ibm_cloud_internal_rules = true\n add_vpc_connectivity_rules = true\n prepend_ibm_rules = true\n rules = [\n {\n name = \"allow-all-443-inbound\"\n action = \"allow\"\n direction = \"inbound\"\n tcp = {\n port_min = 443\n port_max = 443\n }\n destination = \"0.0.0.0/0\"\n source = \"0.0.0.0/0\"\n },\n {\n name = \"allow-all-80-inbound\"\n action = \"allow\"\n direction = \"inbound\"\n tcp = {\n port_min = 80\n port_max = 80\n source_port_min = 80\n source_port_max = 80\n }\n destination = \"0.0.0.0/0\"\n source = \"0.0.0.0/0\"\n },\n {\n name = \"allow-all-ingress-inbound\"\n action = \"allow\"\n direction = \"inbound\"\n tcp = {\n source_port_min = 30000\n source_port_max = 32767\n }\n destination = \"0.0.0.0/0\"\n source = \"0.0.0.0/0\"\n },\n {\n name = \"allow-all-443-outbound\"\n action = \"allow\"\n direction = \"outbound\"\n tcp = {\n source_port_min = 443\n source_port_max = 443\n }\n destination = \"0.0.0.0/0\"\n source = \"0.0.0.0/0\"\n },\n {\n name = \"allow-all-80-outbound\"\n action = \"allow\"\n direction = \"outbound\"\n tcp = {\n source_port_min = 80\n source_port_max = 80\n port_min = 80\n port_max = 80\n }\n destination = \"0.0.0.0/0\"\n source = \"0.0.0.0/0\"\n },\n {\n name = \"allow-all-ingress-outbound\"\n action = \"allow\"\n direction = \"outbound\"\n tcp = {\n port_min = 30000\n port_max = 32767\n }\n destination = \"0.0.0.0/0\"\n source = \"0.0.0.0/0\"\n }\n ]\n }\n]",
746+
"description": "The list of ACLs to create. Provide at least one rule for each ACL. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#network-acls-).",
747+
"required": false,
748+
"virtual": true
749+
},
742750
{
743751
"key": "provider_visibility",
744752
"options": [
@@ -794,6 +802,11 @@
794802
"dependency_input": "subnets",
795803
"version_input": "subnets",
796804
"reference_version": true
805+
},
806+
{
807+
"dependency_input": "network_acls",
808+
"version_input": "network_acls",
809+
"reference_version": true
797810
}
798811
]
799812
},

solutions/fully-configurable/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ variable "use_private_endpoint" {
269269
variable "disable_public_endpoint" {
270270
type = bool
271271
description = "Whether access to the public service endpoint is disabled when the cluster is created. Does not affect existing clusters. You can't disable a public endpoint on an existing cluster, so you can't convert a public cluster to a private cluster. To change a public endpoint to private, create another cluster with this input set to `true`."
272-
default = true
272+
default = false
273273
}
274274

275275
variable "cluster_config_endpoint_type" {

0 commit comments

Comments
 (0)