cloud-native-toolkit · gowdhaman-j · Jul 14, 2022 · Jul 14, 2022 · Jul 14, 2022 · Jul 14, 2022
diff --git a/.github/scripts/validate-deploy.sh b/.github/scripts/validate-deploy.sh
@@ -30,13 +30,13 @@ fi
 echo "Printing argocd/2-services/cluster/${SERVER_NAME}/${TYPE}/${NAMESPACE}-${COMPONENT_NAME}.yaml"
 cat "argocd/2-services/cluster/${SERVER_NAME}/${TYPE}/${NAMESPACE}-${COMPONENT_NAME}.yaml"
 
-if [[ ! -f "payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values-${SERVER_NAME}.yaml" ]]; then
-  echo "Application values not found - payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values-${SERVER_NAME}.yaml"
+if [[ ! -f "payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values.yaml" ]]; then
+  echo "Application values not found - payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values.yaml"
   exit 1
 fi
 
-echo "Printing payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values-${SERVER_NAME}.yaml"
-cat "payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values-${SERVER_NAME}.yaml"
+echo "Printing payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values.yaml"
+cat "payload/2-services/namespace/${NAMESPACE}/${COMPONENT_NAME}/values.yaml"
 
 cd ..
 rm -rf .testrepo

diff --git a/.github/workflows/notify.yaml b/.github/workflows/notify.yaml
@@ -8,4 +8,4 @@ jobs:
   notify:
     uses: cloud-native-toolkit/action-workflows/.github/workflows/notify.yaml@v1
     secrets:
-      TOKEN: ${{ secrets.TOKEN }}
+      TOKEN: ${{ secrets.TOKEN }}
diff --git a/.github/workflows/verify-pr.yaml b/.github/workflows/verify-pr.yaml
@@ -23,4 +23,4 @@ jobs:
       CP_ENTITLEMENT_KEY: ${{ secrets.CP_ENTITLEMENT_KEY }}
 
   verifyMetadata:
-    uses: cloud-native-toolkit/action-workflows/.github/workflows/verify-module-metadata.yaml@v1
+    uses: cloud-native-toolkit/action-workflows/.github/workflows/verify-module-metadata.yaml@v1
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,8 @@
 terraform.tfstate
 terraform.tfstate.backup
 .terraform/
+terraform.tfvars
+test/stages/bin2/
+test/stages/module
 /charts/ibm-datapower-instance/test-secret.yaml
 /charts/ibm-datapower-instance/test.sh
diff --git a/charts/ibm-datapower-instance/templates/configMap.yaml b/charts/ibm-datapower-instance/templates/configMap.yaml
@@ -4,4 +4,4 @@ data:
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: {{ .Values.webUIconfigMap.name }}
+  name: {{ .Values.datapower_instance.webUIconfigMap.name }}
diff --git a/charts/ibm-datapower-instance/templates/instance.yaml b/charts/ibm-datapower-instance/templates/instance.yaml
@@ -2,6 +2,6 @@ apiVersion: datapower.ibm.com/v1beta3
 kind: DataPowerService
 metadata:
   name: {{ .Values.datapower_instance.name }}
-  namespace: {{ .Values.datapower_instance.namespace }}
+
 spec:
   {{- toYaml .Values.datapower_instance.spec | nindent 2 }}
diff --git a/charts/ibm-datapower-instance/templates/secrets.yaml b/charts/ibm-datapower-instance/templates/secrets.yaml
@@ -4,4 +4,4 @@ data:
 kind: Secret
 metadata:
   creationTimestamp: null
-  name: {{ .Values.passwordSecret.name }}
+  name: {{ .Values.datapower_instance.passwordSecret.name }}
diff --git a/charts/ibm-datapower-instance/values.yaml b/charts/ibm-datapower-instance/values.yaml
@@ -23,7 +23,8 @@ datapower_instance:
         passwordSecret: dp-credentials
     version: 10.0-cd
     replicas: 1
-webUIconfigMap:
-  name: dp-webui-config
-passwordSecret:
-  name: dp-credentials
+  webUIconfigMap:
+    name: dp-webui-config
+  passwordSecret:
+    name: dp-credentials
+
diff --git a/main.tf b/main.tf
@@ -10,7 +10,9 @@ locals {
 
   instance_values_content = {
     datapower_instance = {
+
       name = var.dpInstanceName
+      namespace= var.namespace
       spec = {
         domains = [
           {
@@ -44,10 +46,15 @@ locals {
         version = var.dpReleaseVersion
         replicas = var.replicas
       }
-
+      webUIconfigMap={
+        name="dp-webui-config"
+      }
+      passwordSecret={
+        name="dp-credentials"
+      }      
     }
   }
-  values_file = "values-${var.server_name}.yaml"
+  values_file = "values.yaml"
   layer = "services"
   application_branch = "main"
   type="instances"
@@ -99,7 +106,7 @@ resource null_resource setup_instance_gitops {
   }
 
   provisioner "local-exec" {
-    command = "${self.triggers.bin_dir}/igc gitops-module '${self.triggers.name}' -n '${self.triggers.namespace}' --contentDir '${self.triggers.yaml_dir}' --serverName '${self.triggers.server_name}' -l '${self.triggers.layer}' --type=${self.triggers.type} --valueFiles='values.yaml,${local.values_file}'"
+    command = "${self.triggers.bin_dir}/igc gitops-module '${self.triggers.name}' -n '${self.triggers.namespace}' --contentDir '${self.triggers.yaml_dir}' --serverName '${self.triggers.server_name}' -l '${self.triggers.layer}' --type=${self.triggers.type} --valueFiles='${local.values_file}'"
 
     environment = {
       GIT_CREDENTIALS = nonsensitive(self.triggers.git_credentials)

diff --git a/module.yaml b/module.yaml
@@ -6,8 +6,6 @@ tags:
   - gitops
 versions:
   - platforms:
-      - kubernetes
-      - ocp3
       - ocp4
     dependencies:
       - id: gitops
@@ -22,6 +20,11 @@ versions:
         refs:
           - source: github.com/cloud-native-toolkit/terraform-gitops-cp-catalogs.git
             version: ">= 1.0.0"
+      - id: datapower-operator
+        refs:
+          - source: github.com/cloud-native-toolkit/terraform-gitops-cp-datapower-operator.git        
+            version: '>= 1.0.0'    
+
     variables:
       - name: gitops_config
         moduleRef:

diff --git a/test/stages/stage1-cp-catalogs.tf b/test/stages/stage1-cp-catalogs.tf
@@ -4,6 +4,7 @@ module "cp_catalogs" {
   gitops_config = module.gitops.gitops_config
   git_credentials = module.gitops.git_credentials
   server_name = module.gitops.server_name
-  kubeseal_cert = module.gitops.sealed_secrets_cert
+  #kubeseal_cert = module.gitops.sealed_secrets_cert
+  kubeseal_cert = module.cert.cert
   entitlement_key = var.cp_entitlement_key
 }
diff --git a/test/stages/stage1-datapower-operator.tf b/test/stages/stage1-datapower-operator.tf
@@ -4,7 +4,7 @@ module "datapower-operator" {
   gitops_config = module.gitops.gitops_config
   git_credentials = module.gitops.git_credentials
   server_name = module.gitops.server_name
-  namespace = module.gitops_namespace.name
-  kubeseal_cert = module.gitops.sealed_secrets_cert
-  entitlement_key = module.cp_catalogs.entitlement_key
+  catalog = module.cp_catalogs.catalog_ibmoperators
+  channel = module.cp4i-dependencies.datapower.channel
+
 }
diff --git a/test/stages/stage2-datapower.tf b/test/stages/stage2-datapower.tf
@@ -9,7 +9,8 @@ module "datapower" {
   namespace = module.gitops_namespace.name
   catalog = module.cp_catalogs.catalog_ibmoperators
   entitlement_key = module.cp_catalogs.entitlement_key
-  kubeseal_cert = module.gitops.sealed_secrets_cert
+  #kubeseal_cert = module.gitops.sealed_secrets_cert
+  kubeseal_cert = module.cert.cert
 
   # Pulling variables from CP4I dependency management
   dpReleaseVersion  = module.cp4i-dependencies.datapower.version