feat: updated the installPlan approval to Automatic and exposed new v…

…ariable `ws_liberty_operator_install_plan_approval` so it can be configured (#16)

README.md

@@ -128,6 +128,7 @@ No modules.
 | <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_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_ws_liberty_operator_install_plan_approval"></a> [ws\_liberty\_operator\_install\_plan\_approval](#input\_ws\_liberty\_operator\_install\_plan\_approval) | IBM WebSphere Liberty operator approval configuration for OLM upgrade. Set to 'Manual' to manually approve the operator upgrades. Default is `Automatic`. | `string` | `"Automatic"` | no |
 | <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 |

chart/websphere-liberty-operator/templates/ibm-websphere-liberty-operator-subscription.yaml

@@ -5,7 +5,7 @@ metadata:
   name: ibm-websphere-liberty
   namespace: {{ .Values.operatornamespace }}
 spec:
-  installPlanApproval: Manual
+  installPlanApproval: {{ .Values.installplanapprovalconfig }}
   name: ibm-websphere-liberty
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace

chart/websphere-liberty-operator/values.yaml

@@ -2,3 +2,4 @@
 # Declare variables to be passed into your templates.
 
 operatornamespace: openshift-operators
+installplanapprovalconfig: Automatic

extensions/landing-zone/README.md

@@ -1,3 +1,3 @@
 ### WebSphere Liberty operator extension for landing zone
 
-Tutorial: TBD
+This example provides the code to install the WebSphere Liberty operator extension DA on an existing OpenShift cluster

extensions/landing-zone/main.tf

@@ -9,17 +9,18 @@ data "ibm_container_cluster_config" "cluster_config" {
 }
 
 module "websphere_liberty_operator" {
-  source                               = "../.."
-  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
-  ws_liberty_operator_namespace        = var.ws_liberty_operator_namespace
-  ws_liberty_operator_target_namespace = var.ws_liberty_operator_target_namespace
-  cluster_config_endpoint_type         = var.cluster_config_endpoint_type
-  install_wslo_sampleapp               = var.install_wslo_sampleapp
-  wslo_sampleapp_name                  = var.wslo_sampleapp_name
-  wslo_sampleapp_namespace             = var.wslo_sampleapp_namespace
-  operator_helm_release_namespace      = var.operator_helm_release_namespace
+  source                                    = "../.."
+  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
+  ws_liberty_operator_namespace             = var.ws_liberty_operator_namespace
+  ws_liberty_operator_target_namespace      = var.ws_liberty_operator_target_namespace
+  cluster_config_endpoint_type              = var.cluster_config_endpoint_type
+  install_wslo_sampleapp                    = var.install_wslo_sampleapp
+  wslo_sampleapp_name                       = var.wslo_sampleapp_name
+  wslo_sampleapp_namespace                  = var.wslo_sampleapp_namespace
+  operator_helm_release_namespace           = var.operator_helm_release_namespace
+  ws_liberty_operator_install_plan_approval = var.ws_liberty_operator_install_plan_approval
 }
 
 locals {

extensions/landing-zone/variables.tf

@@ -46,6 +46,17 @@ variable "ws_liberty_operator_target_namespace" {
   default     = null
 }
 
+variable "ws_liberty_operator_install_plan_approval" {
+  type        = string
+  description = "IBM WebSphere Liberty operator approval configuration for upgrade through OLM. Set to 'Manual' to manually approve the operator upgrades. Default is `Automatic`."
+  default     = "Automatic"
+  validation {
+    error_message = "Invalid install plan approval configuration! Valid values are 'Automatic' or 'Manual'"
+    condition     = contains(["Automatic", "Manual"], var.ws_liberty_operator_install_plan_approval)
+  }
+  nullable = false
+}
+
 variable "cluster_config_endpoint_type" {
   description = "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."
   type        = string

main.tf

@@ -155,6 +155,13 @@ resource "helm_release" "websphere_liberty_operator" {
     value = var.ws_liberty_operator_namespace
   }
 
+  set {
+    name  = "installplanapprovalconfig"
+    type  = "string"
+    value = var.ws_liberty_operator_install_plan_approval
+  }
+
+  # executed to approve install-plans if var.ws_liberty_operator_install_plan_approval is Manual (if Automatic no change is expected)
   provisioner "local-exec" {
     command     = "${path.module}/scripts/approve-install-plan.sh ${var.ws_liberty_operator_namespace}"
     interpreter = ["/bin/bash", "-c"]

tests/pr_test.go

@@ -31,7 +31,11 @@ func setupOptions(t *testing.T, prefix string, exampleDir string) *testhelper.Te
 		ResourceGroup: resourceGroup,
 		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
 			List: []string{
+				// to skip update error due to operator sample app updates
 				"module.websphere_liberty_operator.helm_release.websphere_liberty_operator_sampleapp[0]",
+				// to skip update error due to operator hash changes
+				// consider to remove this once https://github.com/terraform-ibm-modules/terraform-ibm-websphere-liberty-operator/pull/16 is merged
+				"module.websphere_liberty_operator.helm_release.websphere_liberty_operator",
 			},
 		},
 	})

variables.tf

@@ -40,6 +40,18 @@ variable "ws_liberty_operator_target_namespace" {
   default     = null
 }
 
+variable "ws_liberty_operator_install_plan_approval" {
+  type        = string
+  description = "IBM WebSphere Liberty operator approval configuration for OLM upgrade. Set to 'Manual' to manually approve the operator upgrades. Default is `Automatic`."
+  default     = "Automatic"
+  validation {
+    error_message = "Invalid install plan approval configuration! Valid values are 'Automatic' or 'Manual'"
+    condition     = contains(["Automatic", "Manual"], var.ws_liberty_operator_install_plan_approval)
+  }
+  nullable = false
+}
+
+
 variable "cluster_config_endpoint_type" {
   description = "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."
   type        = string