Skip to content

Commit 37bf298

Browse files
committed
make two cp4d patterns that utilize post-install-hook
Signed-off-by: David-M-IBM <David.massey@ibm.com>
1 parent c550cd0 commit 37bf298

4 files changed

Lines changed: 139 additions & 48 deletions

File tree

cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ spec:
2020
value: "false"
2121
- name: cpd-use-fs-iam
2222
value: "False"
23+
- name: pih-full-git-url
24+
value: "false" # https://<personal-access-token>@github.com/<account/org>/<repo>.git
2325
- name: cpd-sequential-install
2426
value: "True"
2527
- name: cloud-pak-deployer-version

cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ spec:
6161
type: string
6262
description: The IBM entitlement key with permissions for pulling cp4d images
6363
default: "false"
64+
- name: pih-full-git-url
65+
type: string
66+
description: Post install hook full git url for cloning the repo. If repo is private then format it https://<personal-access-token>@github.com/<account/org>/<repo>.git
67+
default: "false"
6468
- name: cpd-confirm-destroy
6569
type: string
6670
description: Should the cloud pak deployer delete components that already exist in the cluster if you don't define them? True to delete components, False to not delete components.
@@ -2057,3 +2061,43 @@ spec:
20572061
persistentVolumeClaim:
20582062
claimName: cloud-pak-deployer-status
20592063
EOF
2064+
- name: post-install-hook
2065+
when:
2066+
- input: $(params.pih-full-git-url)
2067+
operator: notin
2068+
values: ["False","false"]
2069+
runAfter:
2070+
- run-the-deployer-debug
2071+
- run-the-deployer
2072+
params:
2073+
- name: git-url
2074+
value: "$(params.pih-full-git-url)"
2075+
- name: executable-filename
2076+
value: "$(params.pih-executable-file-name)"
2077+
taskSpec:
2078+
params:
2079+
- name: git-url
2080+
- name: executable-filename
2081+
steps:
2082+
- name: get-marketplace-yaml
2083+
image: quay.io/ibmtz/ibm-pak-ubi:latest
2084+
script: |
2085+
#!/usr/bin/env bash
2086+
repo=$(params.git-url)
2087+
executable_file=main.sh
2088+
2089+
git clone $repo git-repo
2090+
2091+
currentDir=$(pwd)
2092+
2093+
chmod u+x $currentDir/git-repo/$executable_file
2094+
2095+
cd git-repo
2096+
./$executable_file
2097+
2098+
if [ $? -eq 0 ]; then
2099+
echo "Post install script execution succeeded."
2100+
else
2101+
echo "Post install script execution failed."
2102+
fi
2103+

cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ spec:
2222
value: "True"
2323
- name: cpd-use-fs-iam
2424
value: "True"
25+
- name: pih-full-git-url
26+
value: "false" # https://<personal-access-token>@github.com/<account/org>/<repo>.git
2527
- name: cloud-pak-deployer-version
2628
value: "v2.9.4"
2729
- name: install-openshift-ai

cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml

Lines changed: 91 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
default: "ocs-storagecluster-cephfs"
1717
- name: custom-file-storage-class
1818
type: string
19-
description: Custom RWX storage class needed for cp4d
19+
description: Custom RWX file storage class needed for cp4d
2020
default: "ocs-storagecluster-cephfs"
2121
- name: custom-block-storage-class
2222
type: string
@@ -28,9 +28,10 @@ spec:
2828
Choose the defined storage class for the cloud pak deployer.
2929
{
3030
"options": [
31-
{"text": "auto-storage","value": "auto-storage", "default": "true"},
32-
{"text": "ocs-storage","value": "ocs-storage"},
33-
{"text": "nfs-storage","value": "nfs-storage"}
31+
"auto-storage",
32+
"ocs-storage",
33+
"custom",
34+
"nfs-storage"
3435
]
3536
}
3637
default: "auto-storage"
@@ -40,10 +41,9 @@ spec:
4041
Choose the defined storage type for the cloud pak deployer.
4142
{
4243
"options": [
43-
{"text": "auto","value": "auto", "default": "true"},
44-
{"text": "ocs","value": "ocs"},
45-
{"text": "custom","value": "custom"},
46-
{"text": "nfs","value": "nfs"}
44+
"auto",
45+
"ocs",
46+
"nfs"
4747
]
4848
}
4949
default: "auto"
@@ -61,52 +61,56 @@ spec:
6161
type: string
6262
description: The IBM entitlement key with permissions for pulling cp4d images
6363
default: "false"
64+
- name: pih-full-git-url
65+
type: string
66+
description: Post install hook full git url for cloning the repo. If repo is private then format it https://<personal-access-token>@github.com/<account/org>/<repo>.git
67+
default: "false"
6468
- name: cpd-confirm-destroy
6569
type: string
6670
description: Should the cloud pak deployer delete components that already exist in the cluster if you don't define them? True to delete components, False to not delete components.
6771
default: "True"
6872
- name: cpd-sequential-install
6973
type: string
7074
description: |
71-
Do you want to install components sequentially?
75+
Do you want to install components sequentially? Choose "True" if yes.
7276
{
7377
"options": [
74-
{"text": "No","value": "False"},
75-
{"text": "Yes","value": "True", "default": "true"}
78+
"False",
79+
"True"
7680
]
7781
}
7882
default: "True"
7983
- name: cpd-use-fs-iam
8084
type: string
8185
description: |
82-
Do you want to enable FS IAM?
86+
Do you want to enable FS IAM? Choose "True" if yes.
8387
{
8488
"options": [
85-
{"text": "Yes","value": "True", "default": "true"},
86-
{"text": "No","value": "False"}
89+
"True",
90+
"False"
8791
]
8892
}
8993
default: "True"
9094

9195
- name: scheduler-state
9296
type: string
9397
description: |
94-
Do you want to install scheduler?
98+
Do you want to install scheduler? Choose "installed" if yes.
9599
{
96100
"options": [
97-
{"text": "No","value": "removed", "default": "true"},
98-
{"text": "Yes","value": "installed"}
101+
"removed",
102+
"installed"
99103
]
100104
}
101105
default: "removed"
102106
- name: analyticsengine-state
103107
type: string
104108
description: |
105-
Do you want to install analytics engine?
109+
Do you want to install analytics engine? Choose "installed" if yes.
106110
{
107111
"options": [
108-
{"text": "No","value": "removed", "default": "true"},
109-
{"text": "Yes","value": "installed"}
112+
"removed",
113+
"installed"
110114
]
111115
}
112116
default: "removed"
@@ -116,31 +120,31 @@ spec:
116120
Choose the size of analytics engine installation. (only applied if component is installed)
117121
{
118122
"options": [
119-
{"text": "Small","value": "small", "default": "true"},
120-
{"text": "Medium","value": "medium"},
121-
{"text": "Large","value": "large"}
123+
"small",
124+
"medium",
125+
"large"
122126
]
123127
}
124128
default: "small"
125129
- name: bigsql-state
126130
type: string
127131
description: |
128-
Do you want to install bigsql?
132+
Do you want to install bigsql? Choose "installed" if yes.
129133
{
130134
"options": [
131-
{"text": "No","value": "removed", "default": "true"},
132-
{"text": "Yes","value": "installed"}
135+
"removed",
136+
"installed"
133137
]
134138
}
135139
default: "removed"
136140
- name: ca-state
137141
type: string
138142
description: |
139-
Do you want to install cognos analytics?
143+
Do you want to install cognos analytics? Choose "installed" if yes.
140144
{
141145
"options": [
142-
{"text": "No","value": "removed", "default": "true"},
143-
{"text": "Yes","value": "installed"}
146+
"removed",
147+
"installed"
144148
]
145149
}
146150
default: "removed"
@@ -150,9 +154,9 @@ spec:
150154
Choose size of cognos analytics installation. (only applied if component is installed)
151155
{
152156
"options": [
153-
{"text": "Small","value": "small", "default": "true"},
154-
{"text": "Medium","value": "medium"},
155-
{"text": "Large","value": "large"}
157+
"small",
158+
"medium",
159+
"large"
156160
]
157161
}
158162
default: "small"
@@ -163,33 +167,33 @@ spec:
163167
- name: dashboard-state
164168
type: string
165169
description: |
166-
Do you want to install cognos dashboards?
170+
Do you want to install cognos dashboards? Choose "installed" if yes.
167171
{
168172
"options": [
169-
{"text": "No","value": "removed", "default": "true"},
170-
{"text": "Yes","value": "installed"}
173+
"removed",
174+
"installed"
171175
]
172176
}
173177
default: "removed"
174-
- name: dataproduct-state
178+
- name: datagate-state
175179
type: string
176180
description: |
177-
Do you want to install Data Product Hub?
181+
Do you want to install datagate? Choose "installed" if yes.
178182
{
179183
"options": [
180-
{"text": "No","value": "removed", "default": "true"},
181-
{"text": "Yes","value": "installed"}
184+
"removed",
185+
"installed"
182186
]
183187
}
184188
default: "removed"
185-
- name: datagate-state
189+
- name: dataproduct-state
186190
type: string
187191
description: |
188-
Do you want to install datagate?
192+
Do you want to install Data Product Hub? Choose "installed" if yes.
189193
{
190194
"options": [
191-
{"text": "No","value": "removed", "default": "true"},
192-
{"text": "Yes","value": "installed"}
195+
"removed",
196+
"installed"
193197
]
194198
}
195199
default: "removed"
@@ -628,7 +632,7 @@ spec:
628632
- name: install-openshift-ai
629633
type: string
630634
description: |
631-
Do you want to install the OpenShift AI operator and configure it for CP4D? Use value True if yes
635+
Do you want to install the OpenShift AI operator and configure it for CP4D? If yes, use value 'True'
632636
{
633637
"options": [
634638
"False",
@@ -639,7 +643,7 @@ spec:
639643
- name: configure-gpu
640644
type: string
641645
description: |
642-
Do you want to install the NVIDIA operator and Node Feature Discovery for GPU nodes? Use value True if yes
646+
Do you want to install the NVIDIA operator and Node Feature Discovery for GPU nodes? If yes, use value 'True'
643647
{
644648
"options": [
645649
"False",
@@ -1077,7 +1081,6 @@ spec:
10771081
]
10781082
}
10791083
default: "False"
1080-
10811084
- name: watsonx-orchestrate-state
10821085
type: string
10831086
description: |
@@ -1284,7 +1287,7 @@ spec:
12841287
values: ["Succeeded"]
12851288
- input: $(params.cpd-use-fs-iam)
12861289
operator: notin
1287-
values: ["True","true"]
1290+
values: ["True",z"true"]
12881291
taskRef:
12891292
kind: Task
12901293
name: ibm-pak
@@ -1735,7 +1738,7 @@ spec:
17351738
- name: spss
17361739
description: SPSS Modeler
17371740
state: $(params.spss-state)
1738-
1741+
17391742
- name: syntheticdata
17401743
description: Synthetic Data Generator
17411744
state: $(params.syntheticdata-state)
@@ -2073,3 +2076,43 @@ spec:
20732076
persistentVolumeClaim:
20742077
claimName: cloud-pak-deployer-status
20752078
EOF
2079+
- name: post-install-hook
2080+
when:
2081+
- input: $(params.pih-full-git-url)
2082+
operator: notin
2083+
values: ["False","false"]
2084+
runAfter:
2085+
- run-the-deployer-debug
2086+
- run-the-deployer
2087+
params:
2088+
- name: git-url
2089+
value: "$(params.pih-full-git-url)"
2090+
- name: executable-filename
2091+
value: "$(params.pih-executable-file-name)"
2092+
taskSpec:
2093+
params:
2094+
- name: git-url
2095+
- name: executable-filename
2096+
steps:
2097+
- name: get-marketplace-yaml
2098+
image: quay.io/ibmtz/ibm-pak-ubi:latest
2099+
script: |
2100+
#!/usr/bin/env bash
2101+
repo=$(params.git-url)
2102+
executable_file=main.sh
2103+
2104+
git clone $repo git-repo
2105+
2106+
currentDir=$(pwd)
2107+
2108+
chmod u+x $currentDir/git-repo/$executable_file
2109+
2110+
cd git-repo
2111+
./$executable_file
2112+
2113+
if [ $? -eq 0 ]; then
2114+
echo "Post install script execution succeeded."
2115+
else
2116+
echo "Post install script execution failed."
2117+
fi
2118+

0 commit comments

Comments
 (0)