Merge pull request #23 from cloud-native-toolkit/dls-pipeline-v2

Dls pipeline v2

Author: davidstacyibm

9.0.x/pipeline-run.yaml

@@ -15,7 +15,12 @@ spec:
     - name: uds-lastname
       value: "Developer"
     - name: use-letsencrypt-certs
-      value: "false"
+      value: "true"
+    #lets encrypt secret location and namespace
+    - name: tlscert-secret
+      value: "user-serving-cert-000"
+    - name: tlscert-namespace
+      value: "openshift-kube-apiserver"
     - name: ibm-entitlement-key
       value: "false"
     #mas-license-secret
@@ -29,7 +34,7 @@ spec:
 
     # install MAS Core. This task may be skipped once done successfully
     - name: mas-install-core
-      value: "false"
+      value: "true"
 
     # install MAS Manage, depending on MAS Core, optionally CP4D/DB2
     - name: mas-install-manage
@@ -82,11 +87,6 @@ spec:
       value: "xxx"
     - name: mas_aibroker_channel
       value: "9.0.x"
-    # cert location in ocpv
-    #- name: tlscert-secret
-    #  value: ingress-certificate-tls
-    #- name: tlscert-namespace
-    #  value: openshift-ingress
 
   workspaces:
     - name: ws

9.0.x/pipeline.yaml

@@ -306,12 +306,6 @@ spec:
               cp $(workspaces.ws.path)/masconfig/certs/core/* $(workspaces.ws.path)/masconfig/certs/predict/
               cp $(workspaces.ws.path)/masconfig/certs/core/* $(workspaces.ws.path)/masconfig/certs/aibroker/
 
-              # copy letsencrypt-certs secret to the name where maximo is expecting to find it.
-              if oc get secret -n openshift-ingress router-certs-default; then
-                echo "router-certs-default secret already exists"
-              else
-                oc get secret $(params.TLSCERT_SECRET_LOCATION) -n $(params.TLSCERT_SECRET_NAMESPACE) -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
-              fi
               exit
     - name: install-mas-core
       when:
@@ -482,6 +476,8 @@ spec:
               export CPD_SERVICE_STORAGE_CLASS=$(params.rwx-storageclass)
               export CPD_SERVICE_BLOCK_STORAGE_CLASS=$(params.rwo-storageclass)
 
+              mkdir -p $MAS_CONFIG_DIR
+
               # Cloud Pak for Data Platform (~1 1/2 hours)
               ROLE_NAME=ibm_catalogs ansible-playbook ibm.mas_devops.run_role
               ROLE_NAME=cp4d ansible-playbook ibm.mas_devops.run_role

9.0.x/sample deployer params/mas-params-ocpv-core.json

@@ -4,9 +4,33 @@
         "params": {
             "rwx-storageclass": "ocs-external-storagecluster-cephfs",
             "rwo-storageclass": "ocs-external-storagecluster-cephfs",
-            "tlscert-secret": "ingress-certificate-tls",
-            "tlscert-namespace": "openshift-ingress",
+            "use-letsencrypt-certs": "true",
+            "tlscert-secret": "user-serving-cert-000",
+            "tlscert-namespace": "openshift-kube-apiserver",
             "mas-install-core": "true"
         }
+    },
+    "certs": {
+        "SAN": [
+            "admin.inst1.apps",
+            "auth.inst1.apps",
+            "api.inst1.apps",
+            "home.inst1.apps",
+            "masdev.home.inst1.apps",
+            "masdev.manage.inst1.apps",
+            "masdev-all.manage.inst1.apps",
+            "masdev-cron.manage.inst1.apps",
+            "masdev-mea.manage.inst1.apps",
+            "masdev-rpt.manage.inst1.apps",
+            "masdev-ui.manage.inst1.apps",
+            "maxinst.manage.inst1.apps",
+            "masdev.health.inst1.apps",
+            "masdev-all.health.inst1.apps",
+            "masdev-cron.health.inst1.apps",
+            "masdev-mea.health.inst1.apps",
+            "masdev-rpt.health.inst1.apps",
+            "masdev-ui.health.inst1.apps",
+            "maxinst.health.inst1.apps"
+        ]  
     }
 }

9.0.x/sample deployer params/mas-params-ocpv-manage-iot-health.json

@@ -4,14 +4,38 @@
         "params": {
             "rwx-storageclass": "ocs-external-storagecluster-cephfs",
             "rwo-storageclass": "ocs-external-storagecluster-cephfs",
-            "tlscert-secret": "ingress-certificate-tls",
-            "tlscert-namespace": "openshift-ingress",
+            "use-letsencrypt-certs": "true",
+            "tlscert-secret": "user-serving-cert-000",
+            "tlscert-namespace": "openshift-kube-apiserver",
             "mas-install-core": "true",
             "mas-install-manage": "true",
             "mas-install-demo-data": "true",
             "mas-cp4d-install-cognos": "true",
             "mas-install-iot": "true",
             "mas-install-health": "true"
         }
+    },
+    "certs": {
+        "SAN": [
+            "admin.inst1.apps",
+            "auth.inst1.apps",
+            "api.inst1.apps",
+            "home.inst1.apps",
+            "masdev.home.inst1.apps",
+            "masdev.manage.inst1.apps",
+            "masdev-all.manage.inst1.apps",
+            "masdev-cron.manage.inst1.apps",
+            "masdev-mea.manage.inst1.apps",
+            "masdev-rpt.manage.inst1.apps",
+            "masdev-ui.manage.inst1.apps",
+            "maxinst.manage.inst1.apps",
+            "masdev.health.inst1.apps",
+            "masdev-all.health.inst1.apps",
+            "masdev-cron.health.inst1.apps",
+            "masdev-mea.health.inst1.apps",
+            "masdev-rpt.health.inst1.apps",
+            "masdev-ui.health.inst1.apps",
+            "maxinst.health.inst1.apps"
+        ]  
     }
 }

9.0.x/sample deployer params/mas-params-ocpv-manage.json

@@ -4,8 +4,9 @@
         "params": {
             "rwx-storageclass": "ocs-external-storagecluster-cephfs",
             "rwo-storageclass": "ocs-external-storagecluster-cephfs",
-            "tlscert-secret": "ingress-certificate-tls",
-            "tlscert-namespace": "openshift-ingress",
+            "use-letsencrypt-certs": "true",
+            "tlscert-secret": "user-serving-cert-000",
+            "tlscert-namespace": "openshift-kube-apiserver",
             "mas-install-core": "true",
             "mas-install-manage": "true",
             "mas-install-demo-data": "true",