Add EN and Apprapp

Author: mukulpalit-ibm

README.md

@@ -37,7 +37,7 @@ Optionally, the module supports advanced security group management for the worke
     * <div style="display: inline-block;"><a href="./examples/cross_kms_support">Cross account KMS encryption example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=bov-cross_kms_support-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/tree/main/examples/cross_kms_support" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
     * <div style="display: inline-block;"><a href="./examples/custom_sg">Attaching custom security groups</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=bov-custom_sg-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/tree/main/examples/custom_sg" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
     * <div style="display: inline-block;"><a href="./examples/fscloud">Financial Services compliant example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=bov-fscloud-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/tree/main/examples/fscloud" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
-    * <div style="display: inline-block;"><a href="./examples/monolith">IBM Cloud OpenShift DA - Monolith Add-ons Module</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=bov-monolith-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/tree/main/examples/monolith" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
+    * <div style="display: inline-block;"><a href="./examples/monolith">IBM Cloud OpenShift DA - Monolith Add-ons Module Example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=bov-monolith-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/tree/main/examples/monolith" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
     * <div style="display: inline-block;"><a href="./examples/multiple_mzr_clusters">2 MZR clusters in same VPC example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=bov-multiple_mzr_clusters-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/tree/main/examples/multiple_mzr_clusters" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
 * [Contributing](#contributing)
 <!-- END OVERVIEW HOOK -->

examples/monolith/README.md

@@ -1,4 +1,4 @@
-# IBM Cloud OpenShift DA - Monolith Add-ons Module
+# IBM Cloud OpenShift DA - Monolith Add-ons Module Example
 
 A simple example that shows how to provision a multi zone OCP VPC cluster as well as all foundational infrastructure and supporting services required for a secure and compliant OpenShift (OCP) cluster deployment on IBM Cloud VPC.
 
@@ -19,3 +19,5 @@ The following resources are provisioned by this example:
 - A COS instance along with 3 buckets for VPC flow logs, metrics/data bucket and activity tracker bucket.
 - A SCC-WP instance
 - A VPC instance
+- An event notifications instance
+- An app configuration service with aggregator enabled

examples/monolith/main.tf

@@ -25,18 +25,23 @@ module "monolith_add_ons" {
   kms_encryption_enabled_boot_volume        = var.kms_encryption_enabled_boot_volume
   existing_boot_volume_kms_key_crn          = var.existing_boot_volume_kms_key_crn
   kms_plan                                  = var.kms_plan
+  en_service_plan                           = var.en_service_plan
+  en_service_endpoints                      = var.en_service_endpoints
   existing_secrets_manager_crn              = var.existing_secrets_manager_crn
   secrets_manager_service_plan              = var.secrets_manager_service_plan
   secrets_manager_endpoint_type             = var.secrets_manager_endpoint_type
   secrets_manager_allowed_network           = var.secrets_manager_allowed_network
   existing_event_notifications_instance_crn = var.existing_event_notifications_instance_crn
   existing_cos_instance_crn                 = var.existing_cos_instance_crn
   cos_instance_plan                         = var.cos_instance_plan
+  management_endpoint_type_for_buckets      = var.management_endpoint_type_for_buckets
   existing_cloud_monitoring_crn             = var.existing_cloud_monitoring_crn
   cloud_monitoring_plan                     = var.cloud_monitoring_plan
   existing_cloud_logs_crn                   = var.existing_cloud_logs_crn
   scc_workload_protection_service_plan      = var.scc_workload_protection_service_plan
   enable_vpc_flow_logs                      = var.enable_vpc_flow_logs
+  app_config_plan                           = var.app_config_plan
+  app_config_service_endpoints              = var.app_config_service_endpoints
 }
 
 ########################################################################################################################

examples/monolith/outputs.tf

@@ -130,6 +130,20 @@ output "kms_instance_crn" {
   description = "The CRN of the Hyper Protect Crypto Service instance or Key Protect instance"
 }
 
+##############################################################################
+# EN Outputs
+##############################################################################
+
+output "en_crn" {
+  description = "Event Notification crn"
+  value       = module.monolith_add_ons.en_crn
+}
+
+output "en_guid" {
+  description = "Event Notification guid"
+  value       = module.monolith_add_ons.en_guid
+}
+
 ##############################################################################
 # SM Outputs
 ##############################################################################

examples/monolith/variables.tf

@@ -155,6 +155,26 @@ variable "kms_plan" {
   # validation performed in terraform-ibm-key-protect module
 }
 
+variable "en_service_plan" {
+  type        = string
+  description = "The pricing plan of the Event Notifications instance. Possible values: `Lite`, `Standard`."
+  default     = "standard"
+  validation {
+    condition     = contains(["lite", "standard"], var.en_service_plan)
+    error_message = "The specified pricing plan is not available. The following plans are supported: `Lite`, `Standard`"
+  }
+}
+
+variable "en_service_endpoints" {
+  type        = string
+  description = "Specify whether you want to enable public, private, or both public and private service endpoints. Possible values: `public`, `private`, `public-and-private`."
+  default     = "public-and-private"
+  validation {
+    condition     = contains(["public", "private", "public-and-private"], var.en_service_endpoints)
+    error_message = "The specified service endpoint is not supported. The following endpoint options are supported: `public`, `private`, `public-and-private`"
+  }
+}
+
 variable "existing_secrets_manager_crn" {
   type        = string
   description = "The CRN of an existing Secrets Manager instance. If not supplied, a new instance is created."
@@ -207,6 +227,16 @@ variable "cos_instance_plan" {
   }
 }
 
+variable "management_endpoint_type_for_buckets" {
+  description = "The type of endpoint for the IBM Terraform provider to use to manage Object Storage buckets. Possible values: `public`, `private`, `direct`. If you specify `private`, enable virtual routing and forwarding in your account, and the Terraform runtime must have access to the the IBM Cloud private network."
+  type        = string
+  default     = "direct"
+  validation {
+    condition     = contains(["public", "private", "direct"], var.management_endpoint_type_for_buckets)
+    error_message = "The specified management_endpoint_type_for_buckets is not a valid selection!"
+  }
+}
+
 variable "existing_cloud_monitoring_crn" {
   type        = string
   default     = null
@@ -255,6 +285,25 @@ variable "enable_vpc_flow_logs" {
   default     = true
 }
 
+variable "app_config_plan" {
+  type        = string
+  description = "Plan for the App Configuration service instance."
+  default     = "enterprise"
+  nullable    = false
+}
+
+variable "app_config_service_endpoints" {
+  type        = string
+  description = "Service Endpoints for the App Configuration service instance, valid endpoints are public or public-and-private."
+  default     = "public"
+  nullable    = false
+
+  validation {
+    condition     = contains(["public", "public-and-private"], var.app_config_service_endpoints)
+    error_message = "Value for service endpoints must be one of the following: \"public\" or \"public-and-private\"."
+  }
+}
+
 ########################################################################################################################
 # OCP VPC cluster
 ########################################################################################################################