Skip to content

Commit 036d4db

Browse files
ocofaighocofaigh
authored
feat: updates to consume latest DA dependencies (#188)
1 parent 7f8fed2 commit 036d4db

File tree

2 files changed

+48
-51
lines changed

2 files changed

+48
-51
lines changed

‎ibm_catalog.json‎

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,19 @@
107107
],
108108
"notes": "[Optional] Required to create the containers-kubernetes-key needed by the OpenShift cluster on IBM Cloud."
109109
},
110-
{
111-
"role_crns": [
112-
"crn:v1:bluemix:public:iam::::role:Administrator"
113-
],
114-
"service_name": "All Account Management services",
115-
"notes": "[Optional] Required to create new resource groups when enabling the Account Configuration integration."
116-
},
117110
{
118111
"role_crns": [
119112
"crn:v1:bluemix:public:iam::::role:Administrator"
120113
],
121114
"service_name": "All Identity and Access enabled services",
122-
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
115+
"notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning."
123116
},
124117
{
125118
"service_name": "is.vpc",
126119
"role_crns": [
127120
"crn:v1:bluemix:public:iam::::role:Administrator"
128121
],
129-
"notes": "[Optional] Required for creating Virtual Private Cloud(VPC)."
122+
"notes": "[Optional] Required for creating Virtual Private Cloud (VPC)."
130123
},
131124
{
132125
"service_name": "cloud-object-storage",
@@ -211,16 +204,36 @@
211204
{
212205
"key": "prefix",
213206
"required": true,
207+
"default_value": "dev",
208+
"random_string": {
209+
"length": 4
210+
},
214211
"value_constraints": [
215212
{
216213
"type": "regex",
217-
"description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters",
214+
"description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.",
218215
"value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
219216
}
220217
]
221218
},
219+
{
220+
"key": "existing_resource_group_name",
221+
"display_name": "resource_group",
222+
"custom_config": {
223+
"type": "resource_group",
224+
"grouping": "deployment",
225+
"original_grouping": "deployment",
226+
"config_constraints": {
227+
"identifier": "rg_name"
228+
}
229+
},
230+
"default_value": "Default",
231+
"description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group.",
232+
"virtual": true
233+
},
222234
{
223235
"key": "cluster_id",
236+
"display_name": "cluster",
224237
"custom_config": {
225238
"type": "cluster_var",
226239
"grouping": "deployment",
@@ -230,6 +243,7 @@
230243
},
231244
{
232245
"key": "cluster_resource_group_id",
246+
"display_name": "cluster_resource_group",
233247
"required": true,
234248
"custom_config": {
235249
"type": "resource_group",
@@ -668,7 +682,7 @@
668682
"required": true,
669683
"virtual": true,
670684
"type": "number",
671-
"default_value": 2,
685+
"default_value": 1,
672686
"description": "Number of worker nodes in each zone of the cluster."
673687
},
674688
{
@@ -694,39 +708,19 @@
694708
"description": "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)."
695709
},
696710
{
697-
"key": "allow_public_access_to_cluster",
711+
"key": "allow_public_access_to_cluster_management",
698712
"type": "boolean",
699713
"required": true,
700714
"virtual": true,
701-
"default_value": false,
702-
"options": [
703-
{
704-
"displayname": "true",
705-
"value": "true"
706-
},
707-
{
708-
"displayname": "false",
709-
"value": "false"
710-
}
711-
],
712-
"description": "When set to `true`, public endpoint will be enabled for the cluster which will allow access to master node of the cluster from outside the VPC network."
715+
"default_value": true,
716+
"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)."
713717
},
714718
{
715719
"key": "allow_outbound_traffic",
716720
"type": "boolean",
717721
"required": true,
718722
"virtual": true,
719-
"default_value": false,
720-
"options": [
721-
{
722-
"displayname": "true",
723-
"value": "true"
724-
},
725-
{
726-
"displayname": "false",
727-
"value": "false"
728-
}
729-
],
723+
"default_value": true,
730724
"description": "Set to true to allow public outbound access from the cluster workers."
731725
},
732726
{
@@ -735,7 +729,13 @@
735729
"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 }",
736730
"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-).",
737731
"required": false,
738-
"virtual": true
732+
"hidden": true,
733+
"virtual": true,
734+
"custom_config": {
735+
"grouping": "deployment",
736+
"original_grouping": "deployment",
737+
"type": "code_editor"
738+
}
739739
},
740740
{
741741
"key": "network_acls",
@@ -744,20 +744,13 @@
744744
"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-).",
745745
"required": false,
746746
"virtual": true,
747+
"hidden": true,
747748
"custom_config": {
748749
"type": "code_editor",
749750
"grouping": "deployment",
750751
"original_grouping": "deployment"
751752
}
752753
},
753-
{
754-
"key": "cloud_logs_instance_name",
755-
"type": "string",
756-
"required": true,
757-
"virtual": true,
758-
"default_value": "cloud-logs",
759-
"description": "The name of the Cloud Logs Instance."
760-
},
761754
{
762755
"key": "secrets_manager_service_plan",
763756
"type": "string",
@@ -833,7 +826,7 @@
833826
"name": "deploy-arch-ibm-cloud-logs",
834827
"description": "Create IBM Cloud Logs Instance for storing and analysing platform and application logs .",
835828
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
836-
"version": "v1.6.28",
829+
"version": "v1.9.0",
837830
"flavors": [
838831
"fully-configurable"
839832
],
@@ -852,8 +845,8 @@
852845
"reference_version": true
853846
},
854847
{
855-
"dependency_input": "cloud_logs_instance_name",
856-
"version_input": "cloud_logs_instance_name",
848+
"dependency_input": "existing_resource_group_name",
849+
"version_input": "existing_resource_group_name",
857850
"reference_version": true
858851
},
859852
{
@@ -887,6 +880,11 @@
887880
"dependency_output": "cluster_id",
888881
"version_input": "cluster_id"
889882
},
883+
{
884+
"dependency_input": "existing_resource_group_name",
885+
"version_input": "existing_resource_group_name",
886+
"reference_version": true
887+
},
890888
{
891889
"dependency_output": "resource_group_id",
892890
"version_input": "cluster_resource_group_id"
@@ -921,8 +919,8 @@
921919
"reference_version": true
922920
},
923921
{
924-
"dependency_input": "allow_public_access_to_cluster",
925-
"version_input": "allow_public_access_to_cluster",
922+
"dependency_input": "allow_public_access_to_cluster_management",
923+
"version_input": "allow_public_access_to_cluster_management",
926924
"reference_version": true
927925
},
928926
{
@@ -971,7 +969,7 @@
971969
"reference_version": true
972970
}
973971
],
974-
"version": "v3.63.1"
972+
"version": "v3.66.0"
975973
}
976974
],
977975
"dependency_version_2": true,

‎tests/pr_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ func TestAgentDefaultConfiguration(t *testing.T) {
286286
"fully-configurable",
287287
map[string]interface{}{
288288
"region": "eu-de",
289-
"prefix": options.Prefix,
290289
},
291290
)
292291

0 commit comments

Comments
 (0)