[WIP] feat: Integrate ocp-base with SLZ

cluster.tf

@@ -1,104 +1,124 @@
-##############################################################################
-# Find valid IKS/ROKS Cluster versions for region
-##############################################################################
-
-data "ibm_container_cluster_versions" "cluster_versions" {}
-
-##############################################################################
-
-
 ##############################################################################
 # Cluster Locals
 ##############################################################################
 
 locals {
-  worker_pools_map = module.dynamic_values.worker_pools_map # Convert list to map
-  clusters_map     = module.dynamic_values.clusters_map     # Convert list to map
-  default_kube_version = {
-    openshift = "${data.ibm_container_cluster_versions.cluster_versions.valid_openshift_versions[length(data.ibm_container_cluster_versions.cluster_versions.valid_openshift_versions) - 1]}_openshift"
-    iks       = data.ibm_container_cluster_versions.cluster_versions.valid_kube_versions[length(data.ibm_container_cluster_versions.cluster_versions.valid_kube_versions) - 1]
-  }
+  workload_cluster = length(module.dynamic_values.clusters_map) >= 1 ? module.dynamic_values.clusters_map["${var.prefix}-workload-cluster"] : null
 }
 
-##############################################################################
-
-
 ##############################################################################
 # Create IKS/ROKS on VPC Cluster
 ##############################################################################
 
-resource "ibm_container_vpc_cluster" "cluster" {
-  for_each          = local.clusters_map
-  name              = "${var.prefix}-${each.value.name}"
-  vpc_id            = each.value.vpc_id
-  resource_group_id = local.resource_groups[each.value.resource_group]
-  flavor            = each.value.machine_type
-  worker_count      = each.value.workers_per_subnet
-  kube_version = (
-    lookup(each.value, "kube_version", null) == "default" # if version is default
-    || lookup(each.value, "kube_version", null) == null   # or if version is null
-    ? local.default_kube_version[each.value.kube_type]    # use default
-    : each.value.kube_version                             # otherwise use value
-  )
-  update_all_workers = lookup(each.value, "update_all_workers", null)
-  tags               = var.tags
-  wait_till          = var.wait_till
-  entitlement        = each.value.entitlement
-  cos_instance_crn   = each.value.cos_instance_crn
-  pod_subnet         = each.value.pod_subnet
-  service_subnet     = each.value.service_subnet
 
-  dynamic "zones" {
-    for_each = each.value.subnets
-    content {
-      subnet_id = zones.value["id"]
-      name      = zones.value["zone"]
-    }
+module "workload_cluster" {
+  depends_on = [
+    module.vpc, module.observability_instances
+  ]
+  count             = length(module.dynamic_values.clusters_map) >= 1 ? 1 : 0
+  source            = "./ocp-all-inclusive"
+  ibmcloud_api_key  = var.ibmcloud_api_key
+  resource_group_id = local.resource_groups[local.workload_cluster.resource_group]
+  region            = var.region
+  cluster_name      = local.workload_cluster.cluster_name
+  vpc_id            = local.workload_cluster.vpc_id
+  vpc_subnets = {
+    vsi-zone-1 = [
+      for index, zone in local.workload_cluster.subnets :
+      {
+        id         = zone.id
+        zone       = zone.zone
+        cidr_block = zone.cidr
+      } if index == 0
+    ],
+    vsi-zone-2 = [
+      for index, zone in local.workload_cluster.subnets :
+      {
+        id         = zone.id
+        zone       = zone.zone
+        cidr_block = zone.cidr
+      } if index == 1
+    ],
+    vsi-zone-3 = [
+      for index, zone in local.workload_cluster.subnets :
+      {
+        id         = zone.id
+        zone       = zone.zone
+        cidr_block = zone.cidr
+      } if index == 2
+    ]
   }
-
-  dynamic "kms_config" {
-    for_each = each.value.kms_config == null ? [] : [each.value.kms_config]
-    content {
-      crk_id           = module.key_management.key_map[kms_config.value.crk_name].key_id
-      instance_id      = module.key_management.key_management_guid
-      private_endpoint = kms_config.value.private_endpoint
-    }
+  worker_pools                       = var.worker_pools
+  ocp_version                        = var.ocp_version
+  cluster_tags                       = var.resource_tags
+  use_existing_cos                   = true
+  existing_cos_id                    = local.workload_cluster.cos_instance_crn
+  existing_key_protect_root_key_id   = module.key_management.key_map[local.workload_cluster.kms_config.crk_name].key_id
+  existing_key_protect_instance_guid = module.key_management.key_management_guid
+  logdna_instance_name               = module.observability_instances[local.workload_cluster.cluster_name].logdna_name
+  logdna_ingestion_key               = module.observability_instances[local.workload_cluster.cluster_name].logdna_ingestion_key
+  sysdig_instance_name               = module.observability_instances[local.workload_cluster.cluster_name].sysdig_name
+  sysdig_access_key                  = module.observability_instances[local.workload_cluster.cluster_name].sysdig_access_key
+  # service_mesh_control_planes        = [module.service_mesh_profiles.public_ingress_egress_no_transit]
+  providers = {
+    helm = helm.workload_cluster
   }
-
-  disable_public_service_endpoint = true
-
-  timeouts {
-    create = "3h"
-    delete = "2h"
-    update = "3h"
-  }
-
 }
 
-##############################################################################
-
-
-##############################################################################
-# Create Worker Pools
-##############################################################################
-
-resource "ibm_container_vpc_worker_pool" "pool" {
-  for_each          = local.worker_pools_map
-  vpc_id            = each.value.vpc_id
-  resource_group_id = local.resource_groups[each.value.resource_group]
-  entitlement       = each.value.entitlement
-  cluster           = ibm_container_vpc_cluster.cluster[each.value.cluster_name].id
-  worker_pool_name  = each.value.name
-  flavor            = each.value.flavor
-  worker_count      = each.value.workers_per_subnet
+locals {
+  management_cluster = length(module.dynamic_values.clusters_map) == 2 ? module.dynamic_values.clusters_map["${var.prefix}-management-cluster"] : null
+}
 
-  dynamic "zones" {
-    for_each = each.value.subnets
-    content {
-      subnet_id = zones.value["id"]
-      name      = zones.value["zone"]
-    }
+module "management_cluster" {
+  depends_on = [
+    module.vpc, module.observability_instances
+  ]
+  count             = length(module.dynamic_values.clusters_map) == 2 ? 1 : 0
+  source            = "./ocp-all-inclusive"
+  ibmcloud_api_key  = var.ibmcloud_api_key
+  resource_group_id = local.resource_groups[local.management_cluster.resource_group]
+  region            = var.region
+  cluster_name      = local.management_cluster.cluster_name
+  vpc_id            = local.management_cluster.vpc_id
+  vpc_subnets = {
+    vsi-zone-1 = [
+      for index, zone in local.management_cluster.subnets :
+      {
+        id         = zone.id
+        zone       = zone.zone
+        cidr_block = zone.cidr
+      } if index == 0
+    ],
+    vsi-zone-2 = [
+      for index, zone in local.management_cluster.subnets :
+      {
+        id         = zone.id
+        zone       = zone.zone
+        cidr_block = zone.cidr
+      } if index == 1
+    ],
+    vsi-zone-3 = [
+      for index, zone in local.management_cluster.subnets :
+      {
+        id         = zone.id
+        zone       = zone.zone
+        cidr_block = zone.cidr
+      } if index == 2
+    ]
+  }
+  worker_pools                       = var.worker_pools
+  ocp_version                        = var.ocp_version
+  cluster_tags                       = var.resource_tags
+  use_existing_cos                   = true
+  existing_cos_id                    = local.management_cluster.cos_instance_crn
+  existing_key_protect_root_key_id   = module.key_management.key_map[local.management_cluster.kms_config.crk_name].key_id
+  existing_key_protect_instance_guid = module.key_management.key_management_guid
+  logdna_instance_name               = module.observability_instances[local.management_cluster.cluster_name].logdna_name
+  logdna_ingestion_key               = module.observability_instances[local.management_cluster.cluster_name].logdna_ingestion_key
+  sysdig_instance_name               = module.observability_instances[local.management_cluster.cluster_name].sysdig_name
+  sysdig_access_key                  = module.observability_instances[local.management_cluster.cluster_name].sysdig_access_key
+  # service_mesh_control_planes        = [module.service_mesh_profiles.public_ingress_egress_no_transit]
+  providers = {
+    helm = helm.management_cluster
   }
 }
-
-##############################################################################

dynamic_values/cluster.tf

@@ -21,13 +21,17 @@ module "ut_cluster_map" {
   prefix = "ut"
   clusters = [
     {
-      name           = "test-cluster"
-      vpc_name       = "test"
-      subnet_names   = ["subnet-1", "subnet-3"]
-      resource_group = "test-resource-group"
-      kube_type      = "openshift"
-      cos_name       = "data-cos"
-      entitlement    = "cloud_pak"
+      name                    = "test-cluster"
+      vpc_name                = "test"
+      subnet_names            = ["subnet-1", "subnet-3"]
+      resource_group          = "test-resource-group"
+      kube_type               = "openshift"
+      cos_name                = "data-cos"
+      logdna_plan             = "7-day"
+      sysdig_plan             = "graduated-tier"
+      enable_platform_logs    = false
+      enable_platform_metrics = false
+      entitlement             = "cloud_pak"
       worker_pools = [
         {
           name               = "logging-worker-pool"

dynamic_values/cluster_worker_pools.tf

@@ -20,13 +20,17 @@ module "ut_worker_pools" {
   prefix = "ut"
   clusters = [
     {
-      name           = "test-cluster"
-      vpc_name       = "test"
-      subnet_names   = ["subnet-1", "subnet-3"]
-      resource_group = "test-resource-group"
-      kube_type      = "openshift"
-      cos_name       = "data-cos"
-      entitlement    = "cloud_pak"
+      name                    = "test-cluster"
+      vpc_name                = "test"
+      subnet_names            = ["subnet-1", "subnet-3"]
+      resource_group          = "test-resource-group"
+      kube_type               = "openshift"
+      cos_name                = "data-cos"
+      entitlement             = "cloud_pak"
+      logdna_plan             = "7-day"
+      sysdig_plan             = "graduated-tier"
+      enable_platform_logs    = false
+      enable_platform_metrics = false
       worker_pools = [
         {
           name               = "logging-worker-pool"

dynamic_values/config_modules/clusters/clusters.tf

@@ -62,6 +62,7 @@ module "composed_cluster_map" {
       vpc_id           = var.vpc_modules[cluster.vpc_name].vpc_id
       subnets          = module.cluster_subnets[cluster.name].subnets
       cos_instance_crn = cluster.kube_type == "openshift" ? var.cos_instance_ids[cluster.cos_name] : null
+      cluster_name     = "${var.prefix}-${cluster.name}"
     })
   ]
   prefix = var.prefix

module-metadata.json

@@ -625,47 +625,55 @@
       "description": "A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. This list only contains instances with a floating IP attached.",
       "pos": {
         "filename": "outputs.tf",
-        "line": 232
+        "line": 250
       }
     },
     "resource_group_names": {
       "name": "resource_group_names",
       "description": "List of resource groups names used within landing zone.",
       "pos": {
         "filename": "outputs.tf",
-        "line": 155
+        "line": 173
       }
     },
     "secrets_manager_name": {
       "name": "secrets_manager_name",
       "description": "Name of secrets manager instance",
       "pos": {
         "filename": "outputs.tf",
-        "line": 166
+        "line": 184
       }
     },
     "security_group_names": {
       "name": "security_group_names",
       "description": "List of security group names",
       "pos": {
         "filename": "outputs.tf",
-        "line": 177
+        "line": 195
       }
     },
     "service_authorization_names": {
       "name": "service_authorization_names",
       "description": "List of service authorization names",
       "pos": {
         "filename": "outputs.tf",
-        "line": 191
+        "line": 209
       }
     },
     "ssh_key_names": {
       "name": "ssh_key_names",
       "description": "List of SSH key names",
       "pos": {
         "filename": "outputs.tf",
-        "line": 202
+        "line": 220
+      }
+    },
+    "subnet_details": {
+      "name": "subnet_details",
+      "description": "List of Subnet created",
+      "pos": {
+        "filename": "outputs.tf",
+        "line": 159
       }
     },
     "subnet_names": {
@@ -681,7 +689,7 @@
       "description": "Name of created transit gateway",
       "pos": {
         "filename": "outputs.tf",
-        "line": 213
+        "line": 231
       }
     },
     "vpc_names": {
@@ -692,36 +700,44 @@
         "line": 133
       }
     },
+    "vpcs": {
+      "name": "vpcs",
+      "description": "List of vpc created and vpc_id",
+      "pos": {
+        "filename": "outputs.tf",
+        "line": 149
+      }
+    },
     "vpe_gateway_names": {
       "name": "vpe_gateway_names",
       "description": "VPE gateway names",
       "pos": {
         "filename": "outputs.tf",
-        "line": 274
+        "line": 292
       }
     },
     "vpn_names": {
       "name": "vpn_names",
       "description": "List of VPN names",
       "pos": {
         "filename": "outputs.tf",
-        "line": 288
+        "line": 306
       }
     },
     "vsi_data": {
       "name": "vsi_data",
       "description": "A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP.",
       "pos": {
         "filename": "outputs.tf",
-        "line": 250
+        "line": 268
       }
     },
     "vsi_names": {
       "name": "vsi_names",
       "description": "List of VSI names",
       "pos": {
         "filename": "outputs.tf",
-        "line": 224
+        "line": 242
       }
     }
   },