fix: bug with rg

Author: Jordan-Williams2

solutions/fully-configurable/README.md

@@ -146,14 +146,14 @@ You need the following permissions to run this module:
 | <a name="input_cpd_admin_password"></a> [cpd\_admin\_password](#input\_cpd\_admin\_password) | Password for the Cloud Pak for Data admin user. | `string` | `"passw0rd"` | no |
 | <a name="input_cpd_entitlement_key"></a> [cpd\_entitlement\_key](#input\_cpd\_entitlement\_key) | Cloud Pak for Data entitlement key for access to the IBM Entitled Registry. Can be fetched from https://myibm.ibm.com/products-services/containerlibrary. | `string` | n/a | yes |
 | <a name="input_cpd_version"></a> [cpd\_version](#input\_cpd\_version) | Cloud Pak for Data version to install.  Only version 5.x.x is supported, latest versions can be found [here](https://www.ibm.com/docs/en/cloud-paks/cp-data?topic=versions-cloud-pak-data). | `string` | `"5.0.3"` | no |
-| <a name="input_existing_cluster_name"></a> [existing\_cluster\_name](#input\_existing\_cluster\_name) | Name of an existing Red Hat OpenShift cluster to create and install watsonx onto. | `string` | `null` | no |
-| <a name="input_existing_resource_group_name"></a> [existing\_resource\_group\_name](#input\_existing\_resource\_group\_name) | Resource group id of the cluster | `string` | `"Default"` | no |
+| <a name="input_existing_cluster_name"></a> [existing\_cluster\_name](#input\_existing\_cluster\_name) | Name of an existing Red Hat OpenShift cluster to create and install watsonx onto. | `string` | n/a | yes |
+| <a name="input_existing_resource_group_name"></a> [existing\_resource\_group\_name](#input\_existing\_resource\_group\_name) | Resource group id of the cluster | `string` | n/a | yes |
 | <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud API key to deploy resources. | `string` | n/a | yes |
 | <a name="input_install_odf_cluster_addon"></a> [install\_odf\_cluster\_addon](#input\_install\_odf\_cluster\_addon) | Install the ODF cluster addon. | `bool` | `true` | no |
 | <a name="input_odf_config"></a> [odf\_config](#input\_odf\_config) | Configuration for the ODF addon. Example add on options can be found [here](https://cloud.ibm.com/docs/openshift?topic=openshift-deploy-odf-classic&interface=cli#install-odf-cli-classic) | `map(string)` | <pre>{<br/>  "addSingleReplicaPool": "false",<br/>  "billingType": "essentials",<br/>  "clusterEncryption": "false",<br/>  "disableNoobaaLB": "false",<br/>  "enableNFS": "false",<br/>  "encryptionInTransit": "false",<br/>  "hpcsBaseUrl": "",<br/>  "hpcsEncryption": "false",<br/>  "hpcsInstanceId": "",<br/>  "hpcsSecretName": "",<br/>  "hpcsServiceName": "",<br/>  "hpcsTokenUrl": "",<br/>  "ignoreNoobaa": "true",<br/>  "numOfOsd": "1",<br/>  "ocsUpgrade": "false",<br/>  "odfDeploy": "true",<br/>  "osdDevicePaths": "",<br/>  "osdSize": "512Gi",<br/>  "osdStorageClassName": "ibmc-vpc-block-metro-10iops-tier",<br/>  "prepareForDisasterRecovery": "false",<br/>  "resourceProfile": "balanced",<br/>  "taintNodes": "false",<br/>  "useCephRBDAsDefaultStorageClass": "false",<br/>  "workerNodes": "all",<br/>  "workerPool": ""<br/>}</pre> | no |
 | <a name="input_odf_version"></a> [odf\_version](#input\_odf\_version) | Version of ODF to install. | `string` | `"4.16.0"` | no |
-| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters. | `string` | `null` | no |
-| <a name="input_region"></a> [region](#input\_region) | Region where resources will be created. To find your VPC region, use `ibmcloud is regions` command to find available regions. | `string` | n/a | yes |
+| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters. | `string` | `"cp4d"` | no |
+| <a name="input_region"></a> [region](#input\_region) | Region where resources will be created. To find your VPC region, use `ibmcloud is regions` command to find available regions. | `string` | `"us-south"` | no |
 | <a name="input_watson_assistant_install"></a> [watson\_assistant\_install](#input\_watson\_assistant\_install) | If watsonx.ai is being installed, also install watson assistant | `bool` | `false` | no |
 | <a name="input_watson_discovery_install"></a> [watson\_discovery\_install](#input\_watson\_discovery\_install) | If watsonx.ai is being installed, also install watson discovery | `bool` | `false` | no |
 | <a name="input_watsonx_ai_install"></a> [watsonx\_ai\_install](#input\_watsonx\_ai\_install) | Determine whether the watsonx.ai cartridge for the deployer will be installed | `bool` | `false` | no |

solutions/fully-configurable/d5cf75b88f655705e8a64567938cfff753508ec6a849f71a0adc84c90f0f22a3_ocp-cd17-cluster_k8sconfig/config.yml

@@ -0,0 +1,26 @@
+apiVersion: v1
+clusters:
+- cluster:
+    server: https://c100-e.us-south.containers.cloud.ibm.com:31046
+  name: ocp-cd17-cluster/d15a61sd0urb50g6kc6g
+- cluster:
+    server: https://c100-e.us-south.containers.cloud.ibm.com:31046
+  name: c100-e-us-south-containers-cloud-ibm-com:31046
+contexts:
+- context:
+    cluster: ocp-cd17-cluster/d15a61sd0urb50g6kc6g
+    namespace: default
+    user: ""
+  name: ocp-cd17-cluster/d15a61sd0urb50g6kc6g
+- context:
+    cluster: c100-e-us-south-containers-cloud-ibm-com:31046
+    namespace: default
+    user: IAM#[email protected]/c100-e-us-south-containers-cloud-ibm-com:31046
+  name: default/c100-e-us-south-containers-cloud-ibm-com:31046/IAM#[email protected]
+current-context: default/c100-e-us-south-containers-cloud-ibm-com:31046/IAM#[email protected]
+kind: Config
+preferences: {}
+users:
+- name: IAM#[email protected]/c100-e-us-south-containers-cloud-ibm-com:31046
+  user:
+    token: sha256~veHYv4TSI-NGn4RC2uMj6F425fGTXusMbAZdzl6oZCE

solutions/fully-configurable/main.tf

@@ -8,9 +8,6 @@ module "resource_group" {
   existing_resource_group_name = var.existing_resource_group_name
 }
 
-locals {
-  existing_resource_group_name = var.existing_resource_group_name != null ? var.existing_resource_group_name : module.resource_group[0].resource_group_id
-}
 
 ########################################################################################################################
 # Watsonx Self Managed OCP module
@@ -28,7 +25,7 @@ module "watsonx_self_managed_ocp" {
   cloud_pak_deployer_release = var.cloud_pak_deployer_release
   cloud_pak_deployer_secret  = var.cloud_pak_deployer_secret
   cluster_name               = var.existing_cluster_name
-  cluster_rg_id              = local.existing_resource_group_name
+  cluster_rg_id              = module.resource_group.resource_group_id
   install_odf_cluster_addon  = var.install_odf_cluster_addon
   odf_version                = var.odf_version
   odf_config                 = var.odf_config

solutions/fully-configurable/variables.tf

@@ -7,7 +7,7 @@ variable "ibmcloud_api_key" {
 variable "prefix" {
   description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 16 or fewer characters."
   type        = string
-  default     = null
+  default     = "cp4d"
   validation {
     error_message = "Prefix must begin with a letter and contain only lowercase letters, numbers, and - characters. Prefixes must end with a lowercase letter or number and be 16 or fewer characters."
     condition     = can(regex("^([a-z]|[a-z][-a-z0-9]*[a-z0-9])$", var.prefix)) && length(var.prefix) <= 16
@@ -18,6 +18,7 @@ variable "region" {
   description = "Region where resources will be created. To find your VPC region, use `ibmcloud is regions` command to find available regions."
   type        = string
   nullable    = false
+  default     = "us-south"
 }
 
 variable "code_engine_project_name" {
@@ -58,13 +59,11 @@ variable "cloud_pak_deployer_secret" {
 variable "existing_cluster_name" {
   description = "Name of an existing Red Hat OpenShift cluster to create and install watsonx onto."
   type        = string
-  default     = null
 }
 
 variable "existing_resource_group_name" {
   description = "Resource group id of the cluster"
   type        = string
-  default     = "Default"
   validation {
     error_message = "`existing_resource_group_name` cannot be null if `existing_cluster_name` is not null."
     condition     = var.existing_cluster_name == null || var.existing_resource_group_name != null

tests/scripts/pre-validation-deploy-ocp-instances.sh

@@ -27,6 +27,8 @@ TF_VARS_FILE="terraform.tfvars"
   terraform apply -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1
 
   region_var_name="region"
+  prefix_var_name="prefix"
+  prefix_value="ocp-$(openssl rand -hex 2)"
   cpd_entitlement_key_var_name="cpd_entitlement_key"
   cpd_entitlement_key_value="${SOFTWARE_ENTITLEMENT_KEY}"
   existing_cluster_name_var_name="existing_cluster_name"
@@ -39,13 +41,15 @@ TF_VARS_FILE="terraform.tfvars"
   cd "${cwd}"
   jq -r --arg region_var_name "${region_var_name}" \
         --arg region_var_value "${REGION}" \
-        --arg cpd_entitlement_key_var_name "${existing_cluster_name_var_name}" \
-        --arg cpd_entitlement_key_value "${existing_cluster_name_value}" \
+        --arg prefix_var_name "${prefix_var_name}" \
+        --arg prefix_value "${prefix_value}" \
+        --arg cpd_entitlement_key_var_name "${cpd_entitlement_key_var_name}" \
+        --arg cpd_entitlement_key_value "${cpd_entitlement_key_value}" \
         --arg existing_cluster_name_var_name "${existing_cluster_name_var_name}" \
         --arg existing_cluster_name_value "${existing_cluster_name_value}" \
         --arg existing_resource_group_name_var_name "${existing_resource_group_name_var_name}" \
         --arg existing_resource_group_name_value "${existing_resource_group_name_value}" \
-        '. + {($region_var_name): $region_var_value, ($cpd_entitlement_key_var_name): $cpd_entitlement_key_value, ($existing_cluster_name_var_name): $existing_cluster_name_value, ($existing_resource_group_name_var_name): $existing_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
+        '. + {($region_var_name): $region_var_value, ($prefix_var_name): $prefix_value, ($cpd_entitlement_key_var_name): $cpd_entitlement_key_value, ($existing_cluster_name_var_name): $existing_cluster_name_value, ($existing_resource_group_name_var_name): $existing_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
 
   echo "Pre-validation complete successfully"
 )