feat: onboard cloudpak 4 data

Author: Jordan-Williams2

main.tf

@@ -12,7 +12,7 @@ module "build_cpd_image" {
   count                      = var.cloud_pak_deployer_image == null ? 1 : 0
   source                     = "./deploy/cpd-image-build"
   prefix                     = var.prefix
-  ibmcloud_api_key = var.ibmcloud_api_key
+  ibmcloud_api_key           = var.ibmcloud_api_key
   region                     = var.region
   code_engine_project_name   = var.code_engine_project_name
   code_engine_project_id     = var.code_engine_project_id

tests/resources/main.tf

@@ -80,12 +80,14 @@ module "ocp_base" {
 ##############################################################################
 
 module "cloudpak_data" {
-  source              = "../../solutions/fully-configurable"
-  ibmcloud_api_key    = var.ibmcloud_api_key
-  prefix              = var.prefix
-  region              = var.region
-  cluster_name        = module.ocp_base.cluster_name
-  cluster_rg_id       = module.resource_group.resource_group_id
-  cpd_admin_password  = var.cpd_admin_password
-  cpd_entitlement_key = var.cpd_entitlement_key
+  source                    = "../.."
+  ibmcloud_api_key          = var.ibmcloud_api_key
+  prefix                    = var.prefix
+  region                    = var.region
+  cluster_name              = module.ocp_base.cluster_name
+  cluster_rg_id             = module.resource_group.resource_group_id
+  cloud_pak_deployer_image  = "quay.io/cloud-pak-deployer/cloud-pak-deployer"
+  cpd_admin_password        = var.cpd_admin_password
+  cpd_entitlement_key       = var.cpd_entitlement_key
+  install_odf_cluster_addon = true
 }

version.tf

@@ -5,13 +5,5 @@ terraform {
       source  = "ibm-cloud/ibm"
       version = "1.78.0"
     }
-    helm = {
-      source  = "hashicorp/helm"
-      version = ">= 2.8.0, <3.0.0"
-    }
-    shell = {
-      source  = "scottwinkler/shell"
-      version = "1.7.10"
-    }
   }
 }