Skip to content

Commit 16990fc

Browse files
cloudnativetoolkitcloudnativetoolkit
committed
updates to use mas-devops
1 parent 6bc1c5b commit 16990fc

6 files changed

Lines changed: 69 additions & 65 deletions

File tree

8.11.x/pipeline-masdevops.yaml renamed to 8.11.x/pipeline-cli.yaml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: tekton.dev/v1beta1
33
kind: Pipeline
44
metadata:
5-
name: mas-masdevops-deploy
5+
name: mas-cli-deploy
66
namespace: default
77
spec:
88
workspaces:
@@ -13,7 +13,7 @@ spec:
1313
default: "maximo-suite"
1414
- name: mas-instance-id
1515
type: string
16-
default: "maximo"
16+
default: "inst1"
1717
- name: mas-workspace-id
1818
type: string
1919
default: "maxworkspace"
@@ -209,20 +209,16 @@ spec:
209209
image: quay.io/congxdev/ibm-pak-ubi:latest
210210
script: |
211211
### this is the method to load certs to the mas installer
212-
mkdir -p $(workspaces.ws.path)/masconfig/certs/core/
213-
wget -qO - https://letsencrypt.org/certs/lets-encrypt-r3.pem > $(workspaces.ws.path)/masconfig/certs/core/ca.crt
214-
oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.key']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/core/tls.key
215-
oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.crt']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/core/tls.crt
216-
ls $(workspaces.ws.path)/masconfig/certs/core/
217-
cat $(workspaces.ws.path)/masconfig/certs/core/tls.key
218-
cat $(workspaces.ws.path)/masconfig/certs/core/tls.crt
212+
#mkdir -p $(workspaces.ws.path)/masconfig/certs
213+
#wget -qO - https://letsencrypt.org/certs/lets-encrypt-r3.pem > $(workspaces.ws.path)/masconfig/certs/ca.crt
214+
#oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.key']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/tls.key
215+
#oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.crt']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/tls.crt
216+
#ls $(workspaces.ws.path)/masconfig/certs/
217+
#cat $(workspaces.ws.path)/masconfig/certs/tls.key
218+
#cat $(workspaces.ws.path)/masconfig/certs/tls.crt
219219
220220
# copy letsencrypt-certs secret to the name where maximo is expecting to find it.
221-
if oc get secret -n openshift-ingress router-certs-default; then
222-
echo "router-certs-default secret already exists"
223-
else
224-
oc get secret letsencrypt-certs -n openshift-ingress -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
225-
fi
221+
oc get secret letsencrypt-certs -n openshift-ingress -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
226222
- name: install-mas
227223
retries: 2
228224
runAfter:
@@ -277,21 +273,25 @@ spec:
277273
script: |
278274
#!/usr/bin/env bash
279275
# extract license id from license.dat
280-
export SLS_LICENSE_ID=$(cat $(workspaces.ws.path)/license.dat | head -1 | cut -d ' ' -f3)
281-
export SLS_LICENSE_FILE=$(workspaces.ws.path)/license.dat
282-
283-
export IBM_ENTITLEMENT_KEY=$(cat $(workspaces.ws.path)/ek.dat)
284-
285-
export MAS_INSTANCE_ID=$(params.mas-instance-id)
286-
287-
export MAS_CONFIG_DIR=$(workspaces.ws.path)/masconfig
288-
export MAS_MANUAL_CERT_MGMT=True
276+
export LICENSE_ID=$(cat $(workspaces.ws.path)/license.dat | head -1 | cut -d ' ' -f3)
289277
290-
export UDS_CONTACT_EMAIL=$(params.uds-email)
291-
export UDS_CONTACT_FIRSTNAME=$(params.uds-firstname)
292-
export UDS_CONTACT_LASTNAME=$(params.uds-lastname)
278+
export ENTITLEMENT_KEY=$(cat $(workspaces.ws.path)/ek.dat)
293279
294-
export MAS_WORKSPACE_ID=$(params.mas-workspace-id)
295-
export MAS_WORKSPACE_NAME=$(params.mas-workspace-name)
280+
#possible setup for manual cert management
281+
# got this via https://github.com/ibm-mas/ansible-devops/pull/501
282+
#export MAS_CONFIG_DIR=$(workspaces.ws.path)/masconfig
283+
#export MAS_MANUAL_CERT_MGMT=True
296284
297-
ansible-playbook ibm.mas_devops.oneclick_core
285+
#run mas install non-interactively
286+
mas install -i $(params.mas-instance-id) \
287+
--accept-license \
288+
-w $(params.mas-workspace-id) \
289+
-W "$(params.mas-workspace-name)" \
290+
-c $(params.mas-catalog-version) \
291+
--mas-channel $(params.mas-channel) \
292+
--ibm-entitlement-key $ENTITLEMENT_KEY \
293+
--license-id $LICENSE_ID --license-file $(workspaces.ws.path)/license.dat \
294+
--uds-email $(params.uds-email) --uds-firstname $(params.uds-firstname) --uds-lastname $(params.uds-lastname) \
295+
--storage-rwo $(params.storage-rwo) --storage-rwx $(params.storage-rwx) \
296+
--storage-pipeline $(params.storage-pipeline) --storage-accessmode $(params.storage-accessmode) \
297+
--no-confirm

8.11.x/pipeline-run-masdevops.yaml renamed to 8.11.x/pipeline-run-cli.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: tekton.dev/v1beta1
33
kind: PipelineRun
44
metadata:
5-
generateName: pr-mas-devops-
5+
generateName: pr-mas-cli-
66
spec:
77
params:
88
- name: uds-email
@@ -21,7 +21,7 @@ spec:
2121
requests:
2222
storage: 1Gi
2323
pipelineRef:
24-
name: mas-masdevops-deploy
24+
name: mas-cli-deploy
2525
podTemplate:
2626
securityContext:
2727
fsGroup: 65532

‎8.11.x/pipeline-run.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: tekton.dev/v1beta1
33
kind: PipelineRun
44
metadata:
5-
generateName: pr-mas-cli-
5+
generateName: pr-mas-devops-
66
spec:
77
params:
88
- name: uds-email
@@ -21,7 +21,7 @@ spec:
2121
requests:
2222
storage: 1Gi
2323
pipelineRef:
24-
name: mas-cli-deploy
24+
name: mas-masdevops-deploy
2525
podTemplate:
2626
securityContext:
2727
fsGroup: 65532

‎8.11.x/pipeline.yaml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: tekton.dev/v1beta1
33
kind: Pipeline
44
metadata:
5-
name: mas-cli-deploy
5+
name: mas-masdevops-deploy
66
namespace: default
77
spec:
88
workspaces:
@@ -13,7 +13,7 @@ spec:
1313
default: "maximo-suite"
1414
- name: mas-instance-id
1515
type: string
16-
default: "inst1"
16+
default: "maximo"
1717
- name: mas-workspace-id
1818
type: string
1919
default: "maxworkspace"
@@ -209,16 +209,20 @@ spec:
209209
image: quay.io/congxdev/ibm-pak-ubi:latest
210210
script: |
211211
### this is the method to load certs to the mas installer
212-
#mkdir -p $(workspaces.ws.path)/masconfig/certs
213-
#wget -qO - https://letsencrypt.org/certs/lets-encrypt-r3.pem > $(workspaces.ws.path)/masconfig/certs/ca.crt
214-
#oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.key']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/tls.key
215-
#oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.crt']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/tls.crt
216-
#ls $(workspaces.ws.path)/masconfig/certs/
217-
#cat $(workspaces.ws.path)/masconfig/certs/tls.key
218-
#cat $(workspaces.ws.path)/masconfig/certs/tls.crt
212+
mkdir -p $(workspaces.ws.path)/masconfig/certs/core/
213+
wget -qO - https://letsencrypt.org/certs/lets-encrypt-r3.pem > $(workspaces.ws.path)/masconfig/certs/core/ca.crt
214+
oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.key']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/core/tls.key
215+
oc get secret letsencrypt-certs -n openshift-config -o jsonpath="{.data['tls\.crt']}" | base64 -d > $(workspaces.ws.path)/masconfig/certs/core/tls.crt
216+
ls $(workspaces.ws.path)/masconfig/certs/core/
217+
cat $(workspaces.ws.path)/masconfig/certs/core/tls.key
218+
cat $(workspaces.ws.path)/masconfig/certs/core/tls.crt
219219
220220
# copy letsencrypt-certs secret to the name where maximo is expecting to find it.
221-
oc get secret letsencrypt-certs -n openshift-ingress -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
221+
if oc get secret -n openshift-ingress router-certs-default; then
222+
echo "router-certs-default secret already exists"
223+
else
224+
oc get secret letsencrypt-certs -n openshift-ingress -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
225+
fi
222226
- name: install-mas
223227
retries: 2
224228
runAfter:
@@ -273,25 +277,21 @@ spec:
273277
script: |
274278
#!/usr/bin/env bash
275279
# extract license id from license.dat
276-
export LICENSE_ID=$(cat $(workspaces.ws.path)/license.dat | head -1 | cut -d ' ' -f3)
280+
export SLS_LICENSE_ID=$(cat $(workspaces.ws.path)/license.dat | head -1 | cut -d ' ' -f3)
281+
export SLS_LICENSE_FILE=$(workspaces.ws.path)/license.dat
282+
283+
export IBM_ENTITLEMENT_KEY=$(cat $(workspaces.ws.path)/ek.dat)
284+
285+
export MAS_INSTANCE_ID=$(params.mas-instance-id)
286+
287+
export MAS_CONFIG_DIR=$(workspaces.ws.path)/masconfig
288+
export MAS_MANUAL_CERT_MGMT=True
277289
278-
export ENTITLEMENT_KEY=$(cat $(workspaces.ws.path)/ek.dat)
290+
export UDS_CONTACT_EMAIL=$(params.uds-email)
291+
export UDS_CONTACT_FIRSTNAME=$(params.uds-firstname)
292+
export UDS_CONTACT_LASTNAME=$(params.uds-lastname)
279293
280-
#possible setup for manual cert management
281-
# got this via https://github.com/ibm-mas/ansible-devops/pull/501
282-
#export MAS_CONFIG_DIR=$(workspaces.ws.path)/masconfig
283-
#export MAS_MANUAL_CERT_MGMT=True
294+
export MAS_WORKSPACE_ID=$(params.mas-workspace-id)
295+
export MAS_WORKSPACE_NAME=$(params.mas-workspace-name)
284296
285-
#run mas install non-interactively
286-
mas install -i $(params.mas-instance-id) \
287-
--accept-license \
288-
-w $(params.mas-workspace-id) \
289-
-W "$(params.mas-workspace-name)" \
290-
-c $(params.mas-catalog-version) \
291-
--mas-channel $(params.mas-channel) \
292-
--ibm-entitlement-key $ENTITLEMENT_KEY \
293-
--license-id $LICENSE_ID --license-file $(workspaces.ws.path)/license.dat \
294-
--uds-email $(params.uds-email) --uds-firstname $(params.uds-firstname) --uds-lastname $(params.uds-lastname) \
295-
--storage-rwo $(params.storage-rwo) --storage-rwx $(params.storage-rwx) \
296-
--storage-pipeline $(params.storage-pipeline) --storage-accessmode $(params.storage-accessmode) \
297-
--no-confirm
297+
ansible-playbook ibm.mas_devops.oneclick_core

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ remember the name of the secret for the pipeline run. ( in the example above "m
4545

4646
## Pipelines organisation
4747

48-
Maximo is deployed with a Tekton Pipeline that is defined in maximo-pipeline.yaml
48+
Maximo is deployed with a Tekton Pipeline that is defined in pipeline.yaml
49+
50+
the pipeline runs the MAS DevOps playbooks and can be modified or extended using other roles and playbooks.
51+
52+
Consult the documentation for MAS DevOps [here](https://ibm-mas.github.io/ansible-devops/)
4953

5054

5155

‎scripts/deploy.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# openshift pipelines installed
55
# deployer cluster tasks
66
# OpenShift client - oc
7-
oc apply -f https://raw.githubusercontent.com/cloud-native-toolkit/deployer-operator-masauto/main/8.10.x/pipeline.yaml
7+
oc apply -f https://raw.githubusercontent.com/cloud-native-toolkit/deployer-operator-masauto/main/8.11.x/pipeline.yaml
88
sleep 20
9-
oc apply -f https://raw.githubusercontent.com/cloud-native-toolkit/deployer-operator-masauto/main/8.10.x/pipeline-run.yaml
9+
oc create -f https://raw.githubusercontent.com/cloud-native-toolkit/deployer-operator-masauto/main/8.11.x/pipeline-run.yaml

0 commit comments

Comments
 (0)