clean up variables (#14)

Clean up charts and variables

Author: balasgit

README.md

@@ -80,7 +80,7 @@ Run this CLI and remove the finalizer value from the YAML as sometimes DB2WH ser
 
 ## Supported platforms
 
-OCP 4.8.36 
+- OCP 4.8.36 
 
 ## References:
 

charts/ibm-cpd-db2wh-instance/templates/instance.yaml

@@ -2,7 +2,7 @@ apiVersion: databases.cpd.ibm.com/v1
 kind: Db2whService
 metadata:
   name: {{ .Values.name }}
-  namespace: gitops-cp4d-instance
+  namespace: {{ .Values.cpd_namespace }} 
   annotations:
     argocd.argoproj.io/sync-wave: "1" 
 spec:

charts/ibm-cpd-db2wh-instance/values.yaml

@@ -1,10 +1,9 @@
-name: db2wh-cr
-cpd_namespace: gitops-cp4d-instance
-operator_namespace: cpd-operators
+# name: db2wh-cr
+# cpd_namespace: gitops-cp4d-instance
 
-license_accept: true
-license: Enterprise
+# license_accept: true
+# license: Enterprise
 
-db_type: db2wh
+# db_type: db2wh
 
 

charts/ibm-cpd-db2wh-subscription/values.yaml

@@ -1,11 +1,10 @@
-license_accept: true
-license: Enterprise
+# license_accept: true
+# license: Enterprise
 
-db2wh_namespace: gitops-cp-db2wh
-db2wh_version: 4.0.2
-db2wh_channel: v1.0
+# db2wh_namespace: gitops-cp-db2wh
+# db2wh_version: 4.0.2
+# db2wh_channel: v1.0
+
+# name: ibm-db2wh-cp4d-operator-catalog-subscription
+# operator_namespace: cpd-operators
 
-name: ibm-db2wh-cp4d-operator-catalog-subscription
-operator_namespace: cpd-operators
-common_services_namespace: ibm-common-services
-cpd_namespace: gitops-cp4d-instance

main.tf

@@ -28,22 +28,18 @@ locals {
   subscription_content = {
     license_accept = true
     license = var.license
-
     db2wh_namespace =var.namespace
     db2wh_version =var.db2_warehouse_version
     db2wh_channel=var.db2_warehouse_channel
-
-
     name= "ibm-db2wh-cp4d-operator-catalog-subscription"
     operator_namespace = var.operator_namespace
-    common_services_namespace = var.common_services_namespace
-    cpd_namespace = var.cpd_namespace
+
   }
 
   instance_content = {
     name = "db2wh-cr"
     cpd_namespace = var.cpd_namespace
-    operator_namespace = var.operator_namespace
+
     spec = {
       license = {
         accept = "true"

variables.tf

@@ -128,12 +128,6 @@ variable "common_services_namespace" {
   default     = "ibm-common-services"
 }
 
-variable "cpd_operators" {
-  type        = string
-  description = "Namespace where cpd is deployed"
-  default     = "cpd-operators"
-}
-
 variable "storage_class" {
   type        = string
   description = "Storage class for DB2WH instance"
@@ -158,4 +152,4 @@ variable "license" {
   default     = "Enterprise"
 }
 
-# db2wh = "cp4d-db2wh"
+