feat: onboard cloudpak 4 data

Author: Jordan-Williams2

tests/resources/README.md

@@ -0,0 +1 @@
+The terraform code in this directory is used by the existing resource test in tests/pr_test.go

tests/resources/main.tf

@@ -1,11 +1,91 @@
 ##############################################################################
-# SLZ VPC
+# Resource Group
 ##############################################################################
 
-module "landing_zone" {
-  source           = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks-quickstart?ref=v7.4.4"
-  ibmcloud_api_key = var.ibmcloud_api_key
-  region           = var.region
-  prefix           = var.prefix
-  resource_tags    = var.resource_tags
+module "resource_group" {
+  source  = "terraform-ibm-modules/resource-group/ibm"
+  version = "1.2.0"
+  # if an existing resource group is not set (null) create a new one using prefix
+  resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
+  existing_resource_group_name = var.resource_group
+}
+
+########################################################################################################################
+# VPC + Subnet + Public Gateway
+#
+# NOTE: This is a very simple VPC with single subnet in a single zone with a public gateway enabled, that will allow
+# all traffic ingress/egress by default.
+# For production use cases this would need to be enhanced by adding more subnets and zones for resiliency, and
+# ACLs/Security Groups for network security.
+########################################################################################################################
+
+resource "ibm_is_vpc" "vpc" {
+  name                      = "${var.prefix}-vpc"
+  resource_group            = module.resource_group.resource_group_id
+  address_prefix_management = "auto"
+  tags                      = var.resource_tags
+}
+
+resource "ibm_is_subnet" "subnet_zone_1" {
+  name                     = "${var.prefix}-subnet-1"
+  vpc                      = ibm_is_vpc.vpc.id
+  resource_group           = module.resource_group.resource_group_id
+  zone                     = "${var.region}-1"
+  total_ipv4_address_count = 256
+}
+
+########################################################################################################################
+# OCP VPC cluster (single zone)
+########################################################################################################################
+
+locals {
+  cluster_vpc_subnets = {
+    default = [
+      {
+        id         = ibm_is_subnet.subnet_zone_1.id
+        cidr_block = ibm_is_subnet.subnet_zone_1.ipv4_cidr_block
+        zone       = ibm_is_subnet.subnet_zone_1.zone
+      }
+    ]
+  }
+
+  worker_pools = [
+    {
+      subnet_prefix    = "default"
+      pool_name        = "default" # ibm_container_vpc_cluster automatically names default pool "default" (See https://github.com/IBM-Cloud/terraform-provider-ibm/issues/2849)
+      machine_type     = "bx2.16x64"
+      workers_per_zone = 2 # minimum of 2 is allowed when using single zone
+      operating_system = "REDHAT_8_64"
+    }
+  ]
+}
+
+module "ocp_base" {
+  source               = "terraform-ibm-modules/base-ocp-vpc/ibm"
+  version              = "3.49.0"
+  resource_group_id    = module.resource_group.resource_group_id
+  region               = var.region
+  tags                 = var.resource_tags
+  cluster_name         = "${var.prefix}-cluster"
+  force_delete_storage = true
+  vpc_id               = ibm_is_vpc.vpc.id
+  vpc_subnets          = local.cluster_vpc_subnets
+  worker_pools         = local.worker_pools
+  access_tags          = []
+}
+
+##############################################################################
+# Monitoring:
+# - Cloud Monitoring instance
+##############################################################################
+
+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
 }

tests/resources/outputs.tf

@@ -2,22 +2,38 @@
 # Outputs
 ##############################################################################
 
-output "prefix" {
-  value       = module.landing_zone.prefix
-  description = "prefix"
-}
-
 output "region" {
   value       = var.region
   description = "Region where SLZ ROKS Cluster is deployed."
 }
 
-output "workload_cluster_id" {
-  value       = module.landing_zone.workload_cluster_id
-  description = "workload cluster ID."
+output "cluster_id" {
+  value       = module.ocp_base.cluster_id
+  description = "ID of the cluster."
+}
+
+output "cluster_crn" {
+  value       = module.ocp_base.cluster_crn
+  description = "CRN of the cluster."
+}
+
+output "cluster_resource_group_id" {
+  value       = module.ocp_base.resource_group_id
+  description = "Resource group ID of the cluster."
+}
+
+output "cluster_name" {
+  value       = module.ocp_base.cluster_name
+  description = "Name of the cluster."
+}
+
+output "instance_id" {
+  value       = module.cloud_monitoring.crn
+  description = "The cloud monitoring instance crn."
 }
 
-output "workload_rg_id" {
-  value       = module.landing_zone.workload_rg_id
-  description = "workload resource group ID."
+output "access_key" {
+  value       = module.cloud_monitoring.access_key
+  description = "The access key of the provisioned IBM Cloud Monitoring instance."
+  sensitive   = true
 }

tests/resources/variables.tf

@@ -1,23 +1,42 @@
 variable "ibmcloud_api_key" {
   type        = string
-  description = "The IBM Cloud API key to deploy resources."
+  description = "The IBM Cloud API Key."
   sensitive   = true
 }
 
 variable "region" {
   type        = string
-  description = "Region to provision all resources created by this example"
+  description = "Region to provision all resources created by this example."
   default     = "us-south"
 }
 
 variable "prefix" {
   type        = string
-  description = "Prefix to append to all resources created by this example"
-  default     = "slz-vpc"
+  description = "Prefix to append to all resources created by this example."
+  default     = "agent-da"
 }
 
 variable "resource_tags" {
   type        = list(string)
-  description = "Optional list of tags to be added to created resources"
-  default     = []
+  description = "Optional list of tags to be added to created resources."
+  default     = ["logs-agent-ocp"]
+}
+
+variable "resource_group" {
+  type        = string
+  description = "The name of an existing resource group to provision resources in. If not specified, a new resource group is created with the `prefix` variable."
+  default     = null
+}
+
+variable "cpd_admin_password" {
+  type        = string
+  description = "The password for the Cloud Pak for Data admin user."
+  sensitive   = true
+  default     = "cpd-admin-password" # pragma: allowlist secret
+}
+
+variable "cpd_entitlement_key" {
+  type        = string
+  description = "The entitlement key for Cloud Pak for Data."
+  sensitive   = true
 }

tests/resources/version.tf

@@ -1,9 +1,10 @@
+
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.9.0"
   required_providers {
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = ">= 1.49.0, < 2.0.0"
+      version = ">= 1.76.1"
     }
   }
 }