Skip to content

Commit 545392f

Browse files
vburckhardtvburckhardt
authored
feat: updates to the Standard - Integrated setup with configurable services DA variation:<br>- allow_public_access_to_cluster_management now defaults to true<br>- allow_outbound_traffic now defaults to true<br>- The following inputs have been hidden: enable_platform_metrics, logs_routing_tenant_regions, enable_ocp_console, addons, additional_worker_pools, default_worker_pool_labels, default_pool_minimum_number_of_nodes, default_pool_maximum_number_of_nodes, additional_security_group_ids, use_private_endpoint, custom_security_group_ids, additional_lb_security_group_ids, additional_vpe_security_group_ids, ibmcloud_kms_api_key, kms_encryption_enabled_cluster, existing_kms_instance_crn, existing_cluster_kms_key_crn, cluster_kms_key_name, cluster_kms_key_ring_name, kms_encryption_enabled_boot_volume, existing_boot_volume_kms_key_crn, enable_secrets_manager_integration, existing_secrets_manager_instance_crn, skip_ocp_secrets_manager_iam_auth_policy, subnets, network_acls, enable_kube_audit (#821)
1 parent 011afb4 commit 545392f

File tree

2 files changed

+44
-16
lines changed

2 files changed

+44
-16
lines changed

‎ibm_catalog.json‎

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,7 @@
528528
"description": "When set to `true`, the IBM Cloud Monitoring instance will be configured to collect platform metrics from the provided region. ⚠️ You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another monitoring instance has already been configured. You may not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).",
529529
"required": true,
530530
"virtual": true,
531+
"hidden": true,
531532
"options": [
532533
{
533534
"displayname": "true",
@@ -546,6 +547,7 @@
546547
"description": "To manage platform logs that are generated by IBM Cloud services in a region of IBM Cloud, you must create a tenant in each region that you operate. Pass a list of regions to create a tenant in. For example: [\"us-south\", \"us-east\"]. [Learn more](https://cloud.ibm.com/docs/logs-router?topic=logs-router-about-platform-logs).",
547548
"required": true,
548549
"virtual": true,
550+
"hidden": true,
549551
"custom_config": {
550552
"grouping": "deployment",
551553
"original_grouping": "deployment",
@@ -616,10 +618,12 @@
616618
]
617619
},
618620
{
619-
"key": "enable_ocp_console"
621+
"key": "enable_ocp_console",
622+
"hidden": true
620623
},
621624
{
622625
"key": "addons",
626+
"hidden": true,
623627
"custom_config": {
624628
"type": "code_editor",
625629
"grouping": "deployment",
@@ -633,6 +637,7 @@
633637
{
634638
"key": "additional_worker_pools",
635639
"type": "array",
640+
"hidden": true,
636641
"custom_config": {
637642
"type": "code_editor",
638643
"grouping": "deployment",
@@ -658,6 +663,7 @@
658663
},
659664
{
660665
"key": "default_worker_pool_labels",
666+
"hidden": true,
661667
"custom_config": {
662668
"type": "code_editor",
663669
"grouping": "deployment",
@@ -669,13 +675,16 @@
669675
"hidden": true
670676
},
671677
{
672-
"key": "default_pool_minimum_number_of_nodes"
678+
"key": "default_pool_minimum_number_of_nodes",
679+
"hidden": true
673680
},
674681
{
675-
"key": "default_pool_maximum_number_of_nodes"
682+
"key": "default_pool_maximum_number_of_nodes",
683+
"hidden": true
676684
},
677685
{
678686
"key": "additional_security_group_ids",
687+
"hidden": true,
679688
"custom_config": {
680689
"type": "array",
681690
"grouping": "deployment",
@@ -690,7 +699,8 @@
690699
"hidden": true
691700
},
692701
{
693-
"key": "use_private_endpoint"
702+
"key": "use_private_endpoint",
703+
"hidden": true
694704
},
695705
{
696706
"key": "cluster_config_endpoint_type",
@@ -731,6 +741,7 @@
731741
},
732742
{
733743
"key": "custom_security_group_ids",
744+
"hidden": true,
734745
"custom_config": {
735746
"type": "array",
736747
"grouping": "deployment",
@@ -746,6 +757,7 @@
746757
},
747758
{
748759
"key": "additional_lb_security_group_ids",
760+
"hidden": true,
749761
"description": "A list of additional security group IDs to be attached to the load balancers associated with the cluster. These groups are applied in addition to the default IBM-managed security group."
750762
},
751763
{
@@ -754,17 +766,20 @@
754766
},
755767
{
756768
"key": "additional_vpe_security_group_ids",
769+
"hidden": true,
757770
"custom_config": {
758771
"type": "code_editor",
759772
"grouping": "deployment",
760773
"original_grouping": "deployment"
761774
}
762775
},
763776
{
764-
"key": "ibmcloud_kms_api_key"
777+
"key": "ibmcloud_kms_api_key",
778+
"hidden": true
765779
},
766780
{
767-
"key": "kms_encryption_enabled_cluster"
781+
"key": "kms_encryption_enabled_cluster",
782+
"hidden": true
768783
},
769784
{
770785
"key": "existing_kms_instance_crn",
@@ -774,10 +789,12 @@
774789
"description": "The value provided for 'existing_kms_instance_crn' is not valid.",
775790
"value": "^__NULL__$|^crn:(.*:){3}(kms|hs-crypto):(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
776791
}
777-
]
792+
],
793+
"hidden": true
778794
},
779795
{
780796
"key": "existing_cluster_kms_key_crn",
797+
"hidden": true,
781798
"value_constraints": [
782799
{
783800
"type": "regex",
@@ -801,16 +818,20 @@
801818
"hidden": true
802819
},
803820
{
804-
"key": "cluster_kms_key_name"
821+
"key": "cluster_kms_key_name",
822+
"hidden": true
805823
},
806824
{
807-
"key": "cluster_kms_key_ring_name"
825+
"key": "cluster_kms_key_ring_name",
826+
"hidden": true
808827
},
809828
{
810-
"key": "kms_encryption_enabled_boot_volume"
829+
"key": "kms_encryption_enabled_boot_volume",
830+
"hidden": true
811831
},
812832
{
813833
"key": "existing_boot_volume_kms_key_crn",
834+
"hidden": true,
814835
"value_constraints": [
815836
{
816837
"type": "regex",
@@ -839,7 +860,8 @@
839860
}
840861
},
841862
{
842-
"key": "enable_secrets_manager_integration"
863+
"key": "enable_secrets_manager_integration",
864+
"hidden": true
843865
},
844866
{
845867
"key": "existing_secrets_manager_instance_crn",
@@ -849,10 +871,12 @@
849871
"description": "The value provided for 'existing_secrets_manager_instance_crn' is not valid.",
850872
"value": "^__NULL__$|^crn:(.*:){3}secrets-manager:(.*:){2}[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}::$"
851873
}
852-
]
874+
],
875+
"hidden": true
853876
},
854877
{
855878
"key": "secrets_manager_secret_group_id",
879+
"hidden": true,
856880
"value_constraints": [
857881
{
858882
"type": "regex",
@@ -906,14 +930,16 @@
906930
]
907931
},
908932
{
909-
"key": "skip_ocp_secrets_manager_iam_auth_policy"
933+
"key": "skip_ocp_secrets_manager_iam_auth_policy",
934+
"hidden": true
910935
},
911936
{
912937
"key": "subnets",
913938
"default_value": "{\n zone-1 = [\n {\n name = \"subnet-a\"\n cidr = \"10.10.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-2 = [\n {\n name = \"subnet-b\"\n cidr = \"10.20.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-3 = [\n {\n name = \"subnet-c\"\n cidr = \"10.30.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ]\n }",
914939
"description": "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addresses. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-).",
915940
"required": false,
916941
"virtual": true,
942+
"hidden": true,
917943
"custom_config": {
918944
"grouping": "deployment",
919945
"original_grouping": "deployment",
@@ -927,6 +953,7 @@
927953
"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-).",
928954
"required": false,
929955
"virtual": true,
956+
"hidden": true,
930957
"custom_config": {
931958
"type": "code_editor",
932959
"grouping": "deployment",
@@ -952,7 +979,8 @@
952979
"hidden": true
953980
},
954981
{
955-
"key": "enable_kube_audit"
982+
"key": "enable_kube_audit",
983+
"hidden": true
956984
},
957985
{
958986
"key": "audit_deployment_name",

‎solutions/fully-configurable/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,13 @@ variable "use_private_endpoint" {
269269
variable "allow_public_access_to_cluster_management" {
270270
type = bool
271271
description = "Set to true to access the cluster through a public cloud service endpoint. [Learn More](https://cloud.ibm.com/docs/openshift?topic=openshift-access_cluster)."
272-
default = false
272+
default = true
273273
}
274274

275275
variable "allow_outbound_traffic" {
276276
type = bool
277277
description = "Set to true to allow public outbound access from the cluster workers."
278-
default = false
278+
default = true
279279
}
280280

281281
variable "cluster_config_endpoint_type" {

0 commit comments

Comments
 (0)