fix: expose cluster entitlement variable for OCP quickstart DA solution (#756)

Author: toddgiguere

patterns/roks-quickstart/main.tf

@@ -5,6 +5,7 @@
 locals {
   default_ocp_version = "${data.ibm_container_cluster_versions.cluster_versions.default_openshift_version}_openshift"
   ocp_version         = var.kube_version == null || var.kube_version == "default" ? local.default_ocp_version : "${var.kube_version}_openshift"
+  entitlement_val     = var.entitlement == null ? "null" : "\"${var.entitlement}\""
 }
 
 data "ibm_container_cluster_versions" "cluster_versions" {
@@ -48,7 +49,7 @@ locals {
          "vpc_name": "workload",
          "worker_pools": [],
          "workers_per_subnet": 1,
-         "entitlement": "cloud_pak",
+         "entitlement": ${local.entitlement_val},
          "disable_public_endpoint": false
       }
    ],

patterns/roks-quickstart/variables.tf

@@ -11,7 +11,7 @@ variable "ibmcloud_api_key" {
 variable "prefix" {
   description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 13 or fewer characters."
   type        = string
-  default     = "land-zone-roks-qs"
+  default     = "lz-roks-qs"
 
   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 13 or fewer characters."
@@ -42,3 +42,9 @@ variable "flavor" {
   type        = string
   default     = "bx2.4x16"
 }
+
+variable "entitlement" {
+  description = "If you do not have an entitlement, leave as null. Entitlement reduces additional OCP Licence cost in OpenShift clusters. Use Cloud Pak with OCP Licence entitlement to create the OpenShift cluster. Note It is set only when the first time creation of the cluster, further modifications are not impacted Set this argument to cloud_pak only if you use the cluster with a Cloud Pak that has an OpenShift entitlement."
+  type        = string
+  default     = null
+}

tests/pr_test.go

@@ -157,6 +157,9 @@ func setupOptionsROKSQuickStartPattern(t *testing.T, prefix string, dir string)
 		TerraformDir:     dir,
 		Prefix:           prefix,
 		CloudInfoService: sharedInfoSvc,
+		TerraformVars: map[string]interface{}{
+			"entitlement": "cloud_pak",
+		},
 	})
 
 	return options
@@ -201,9 +204,11 @@ func setupOptionsRoksPattern(t *testing.T, prefix string) *testhelper.TestOption
 	})
 
 	options.TerraformVars = map[string]interface{}{
-		"prefix": options.Prefix,
-		"tags":   options.Tags,
-		"region": options.Region,
+		"prefix":      options.Prefix,
+		"tags":        options.Tags,
+		"region":      options.Region,
+		"entitlement": "cloud_pak",
+		"flavor":      "bx2.4x16",
 	}
 
 	return options
@@ -544,6 +549,7 @@ func TestRunROKSQuickStartPatternSchematics(t *testing.T) {
 		{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
 		{Name: "region", Value: options.Region, DataType: "string"},
 		{Name: "prefix", Value: options.Prefix, DataType: "string"},
+		{Name: "entitlement", Value: "cloud_pak", DataType: "string"},
 	}
 
 	err := options.RunSchematicTest()
@@ -585,6 +591,8 @@ func TestRunRoksPatternSchematics(t *testing.T) {
 		{Name: "region", Value: options.Region, DataType: "string"},
 		{Name: "prefix", Value: options.Prefix, DataType: "string"},
 		{Name: "tags", Value: options.Tags, DataType: "list(string)"},
+		{Name: "entitlement", Value: "cloud_pak", DataType: "string"},
+		{Name: "flavor", Value: "bx2.4x16", DataType: "string"},
 	}
 
 	err := options.RunSchematicTest()