First release cleanup

README.md

@@ -22,7 +22,7 @@ For more information about the IBM WebSphere Liberty operator refer to the offic
 ## Overview
 * [terraform-ibm-websphere-liberty-operator](#terraform-ibm-websphere-liberty-operator)
 * [Examples](./examples)
-    * [Complete example](./examples/complete)
+    * [WebSphere Liberty operator on IBM Cloud Red Hat OpenShift cluster complete example](./examples/complete)
 * [Contributing](#contributing)
 <!-- END OVERVIEW HOOK -->
 
@@ -126,10 +126,8 @@ No modules.
 | <a name="input_cluster_config_endpoint_type"></a> [cluster\_config\_endpoint\_type](#input\_cluster\_config\_endpoint\_type) | Specify which type of endpoint to use for for cluster config access: 'default', 'private', 'vpe', 'link'. 'default' value will use the default endpoint of the cluster. | `string` | `"default"` | no |
 | <a name="input_cluster_id"></a> [cluster\_id](#input\_cluster\_id) | Id of the target IBM Cloud OpenShift Cluster. | `string` | n/a | yes |
 | <a name="input_create_ws_liberty_operator_namespace"></a> [create\_ws\_liberty\_operator\_namespace](#input\_create\_ws\_liberty\_operator\_namespace) | Whether to create the namespace where the IBM WebSphere Liberty operator is deployed. Default is `false`. | `bool` | `false` | no |
-| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | APIkey that's associated with the account to use. | `string` | `null` | no |
 | <a name="input_install_wslo_sampleapp"></a> [install\_wslo\_sampleapp](#input\_install\_wslo\_sampleapp) | Whether to deploy the WebSphere Application Server Liberty sample application. Default is  `false`. | `bool` | `false` | no |
 | <a name="input_operator_helm_release_namespace"></a> [operator\_helm\_release\_namespace](#input\_operator\_helm\_release\_namespace) | Namespace to deploy the helm releases. Default to liberty-operator-helm-release. | `string` | `"liberty-operator"` | no |
-| <a name="input_region"></a> [region](#input\_region) | Cluster region. | `string` | n/a | yes |
 | <a name="input_ws_liberty_operator_namespace"></a> [ws\_liberty\_operator\_namespace](#input\_ws\_liberty\_operator\_namespace) | Namespace where the IBM WebSphere Liberty operator is deployed. Default is `openshift-operators`. | `string` | `"openshift-operators"` | no |
 | <a name="input_ws_liberty_operator_target_namespace"></a> [ws\_liberty\_operator\_target\_namespace](#input\_ws\_liberty\_operator\_target\_namespace) | Namespace that the the IBM WebSphere Liberty operator watches. Default is `null`, which means that the operator watches all the namespaces. | `string` | `null` | no |
 | <a name="input_wslo_sampleapp_name"></a> [wslo\_sampleapp\_name](#input\_wslo\_sampleapp\_name) | Application name to use for the WebSphere Application Server Liberty sample application. | `string` | `"websphereliberty-app-sample"` | no |

examples/complete/README.md

@@ -1,7 +1,7 @@
-# Complete example
+# WebSphere Liberty operator on IBM Cloud Red Hat OpenShift cluster complete example
 
 An end-to-end complete example that will provision the following:
-- A new resource group if one is not passed in.
-- A new VPC with 3 subnets and a new OpenShift cluster in the VPC with 3 workers pools
+- A new resource group if one is not passed in
+- A new VPC with two subnets and a new OpenShift cluster in the VPC with one workers pool
 - The IBM WebSphere Liberty operator in the default operator namespace
 - The IBM WebSphere Liberty sample app

examples/complete/main.tf

@@ -23,7 +23,7 @@ resource "ibm_is_vpc" "vpc" {
 
 # public gws
 resource "ibm_is_public_gateway" "gateway" {
-  for_each       = toset(["1", "2", "3"])
+  for_each       = toset(["1", "2"])
   name           = "${var.prefix}-gateway-${each.key}"
   vpc            = ibm_is_vpc.vpc.id
   resource_group = module.resource_group.resource_group_id
@@ -32,7 +32,7 @@ resource "ibm_is_public_gateway" "gateway" {
 
 
 resource "ibm_is_subnet" "cluster_subnets" {
-  for_each                 = toset(["1", "2", "3"])
+  for_each                 = toset(["1", "2"])
   name                     = "${var.prefix}-subnet-${each.key}"
   vpc                      = ibm_is_vpc.vpc.id
   resource_group           = module.resource_group.resource_group_id
@@ -96,9 +96,7 @@ module "ocp_base" {
 
 module "websphere_liberty_operator" {
   source                               = "../.."
-  region                               = var.region
   cluster_id                           = module.ocp_base.cluster_id
   create_ws_liberty_operator_namespace = false
   install_wslo_sampleapp               = true
-  ibmcloud_api_key                     = var.ibmcloud_api_key
 }

extensions/landing-zone/README.md

@@ -1,3 +1,3 @@
-### # Client-To-Site VPN extension for landing zone
+### WebSphere Liberty operator extension for landing zone
 
 Tutorial: TBD

extensions/landing-zone/kubeconfig/README.md

@@ -1,2 +1,2 @@
 This directory must exist in source control so the `ibm_container_cluster_config` data lookup can use it to place the
-config.yml used to connect to a kubernetes cluster (See https://github.ibm.com/GoldenEye/issues/issues/552).
+config.yml used to connect to a kubernetes cluster.

extensions/landing-zone/main.tf

@@ -10,8 +10,6 @@ data "ibm_container_cluster_config" "cluster_config" {
 
 module "websphere_liberty_operator" {
   source                               = "../.."
-  ibmcloud_api_key                     = var.ibmcloud_api_key
-  region                               = var.region
   cluster_id                           = var.cluster_id
   add_ibm_operator_catalog             = var.add_ibm_operator_catalog
   create_ws_liberty_operator_namespace = var.create_ws_liberty_operator_namespace

kubeconfig/README.md

@@ -1,2 +1,2 @@
 This directory must exist in source control so the `ibm_container_cluster_config` data lookup can use it to place the
-config.yml used to connect to a kubernetes cluster (See https://github.ibm.com/GoldenEye/issues/issues/552).
+config.yml used to connect to a kubernetes cluster.

scripts/confirm-wsloperator-operational.sh

@@ -31,7 +31,7 @@ if [ ${fail} == true ]; then
   kubectl describe CatalogSource ibm-operator-catalog -n openshift-marketplace
   echo
   echo "Describe output of ibm-websphere-liberty Subscription in ${namespace} namespace"
-  kubectl describe Subscription ibm-websphere-liberty -n "${namespace}" -o wide
+  kubectl describe Subscription ibm-websphere-liberty -n "${namespace}"
   echo
   echo "List of ${WSLO_DEPLOYMENT_NAME} deployments in ${namespace} namespace"
   kubectl get deployment "${WSLO_DEPLOYMENT_NAME}" -n "${namespace}" -o wide

tests/pr_test.go

@@ -63,8 +63,16 @@ func TestRunSLZExample(t *testing.T) {
 	require.True(t, present, checkVariable+" environment variable not set")
 	require.NotEqual(t, "", val, checkVariable+" environment variable is empty")
 
-	// Programmatically determine region to use based on availability
-	region, _ := testhelper.GetBestVpcRegion(val, "../common-dev-assets/common-go-assets/cloudinfo-region-vpc-gen2-prefs.yaml", "eu-de")
+	// Verify region variable is set, otherwise it computes it
+	region := ""
+	checkRegion := "TF_VAR_region"
+	valRegion, presentRegion := os.LookupEnv(checkRegion)
+	if presentRegion {
+		region = valRegion
+	} else {
+		// Programmatically determine region to use based on availability
+		region, _ = testhelper.GetBestVpcRegion(val, "../common-dev-assets/common-go-assets/cloudinfo-region-vpc-gen2-prefs.yaml", "eu-de")
+	}
 
 	logger.Log(t, "Tempdir: ", tempTerraformDir)
 	existingTerraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
@@ -88,8 +96,9 @@ func TestRunSLZExample(t *testing.T) {
 		// Deploy WAS extension
 		// ------------------------------------------------------------------------------------
 
-		fmt.Println("Sleeping for 2 minutes to allow RBAC to sync")
-		time.Sleep(120 * time.Second)
+		rbacSynchSleepTime := 180
+		logger.Log(t, fmt.Sprintf("Sleeping for %d seconds to allow RBAC to sync", rbacSynchSleepTime))
+		time.Sleep(time.Duration(rbacSynchSleepTime) * time.Second)
 
 		options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 			Testing:      t,

variables.tf

@@ -2,19 +2,6 @@
 # Input Variables
 ##############################################################################
 
-variable "ibmcloud_api_key" {
-  description = "APIkey that's associated with the account to use."
-  type        = string
-  sensitive   = true
-  default     = null
-}
-
-variable "region" {
-  description = "Cluster region."
-  type        = string
-  nullable    = false
-}
-
 variable "cluster_id" {
   type        = string
   description = "Id of the target IBM Cloud OpenShift Cluster."