mas-cli 11.4.0__py3-none-any.whl → 11.6.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of mas-cli might be problematic. Click here for more details.
- mas/cli/__init__.py +1 -1
- mas/cli/cli.py +7 -8
- mas/cli/displayMixins.py +18 -14
- mas/cli/gencfg.py +3 -2
- mas/cli/install/__init__.py +1 -1
- mas/cli/install/app.py +96 -46
- mas/cli/install/argBuilder.py +170 -159
- mas/cli/install/argParser.py +194 -2
- mas/cli/install/settings/__init__.py +5 -4
- mas/cli/install/settings/additionalConfigs.py +27 -26
- mas/cli/install/settings/db2Settings.py +2 -2
- mas/cli/install/settings/kafkaSettings.py +1 -0
- mas/cli/install/settings/manageSettings.py +62 -19
- mas/cli/install/settings/turbonomicSettings.py +1 -0
- mas/cli/install/summarizer.py +36 -9
- mas/cli/templates/ibm-mas-tekton.yaml +1920 -360
- mas/cli/uninstall/__init__.py +1 -1
- mas/cli/uninstall/app.py +15 -14
- mas/cli/uninstall/argParser.py +1 -1
- mas/cli/update/__init__.py +1 -1
- mas/cli/update/app.py +39 -39
- mas/cli/update/argParser.py +1 -1
- mas/cli/upgrade/__init__.py +1 -1
- mas/cli/upgrade/app.py +8 -7
- mas/cli/upgrade/argParser.py +1 -1
- {mas_cli-11.4.0.data → mas_cli-11.6.0.data}/scripts/mas-cli +8 -6
- {mas_cli-11.4.0.dist-info → mas_cli-11.6.0.dist-info}/METADATA +2 -2
- {mas_cli-11.4.0.dist-info → mas_cli-11.6.0.dist-info}/RECORD +30 -30
- {mas_cli-11.4.0.dist-info → mas_cli-11.6.0.dist-info}/WHEEL +1 -1
- {mas_cli-11.4.0.dist-info → mas_cli-11.6.0.dist-info}/top_level.txt +0 -0
|
@@ -1,4 +1,238 @@
|
|
|
1
1
|
|
|
2
|
+
# --------------------------------------------------------------------------------
|
|
3
|
+
# /home/runner/work/cli/cli/tekton/target/tasks/aibroker.yaml
|
|
4
|
+
# --------------------------------------------------------------------------------
|
|
5
|
+
---
|
|
6
|
+
apiVersion: tekton.dev/v1beta1
|
|
7
|
+
kind: Task
|
|
8
|
+
metadata:
|
|
9
|
+
name: mas-devops-aibroker
|
|
10
|
+
spec:
|
|
11
|
+
params:
|
|
12
|
+
# Common: Control the image pull policy for the CLI container image
|
|
13
|
+
- name: image_pull_policy
|
|
14
|
+
type: string
|
|
15
|
+
default: IfNotPresent
|
|
16
|
+
|
|
17
|
+
# Common: Support for saving task execution results to a MongoDb instance
|
|
18
|
+
- name: devops_suite_name
|
|
19
|
+
type: string
|
|
20
|
+
description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
|
|
21
|
+
default: ""
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
# Pre-Release Support
|
|
25
|
+
- name: artifactory_username
|
|
26
|
+
default: ''
|
|
27
|
+
type: string
|
|
28
|
+
description: Required to use development MAS builds
|
|
29
|
+
- name: artifactory_token
|
|
30
|
+
default: ''
|
|
31
|
+
type: string
|
|
32
|
+
description: Required to use development MAS builds
|
|
33
|
+
|
|
34
|
+
# Entitlement
|
|
35
|
+
- name: ibm_entitlement_key
|
|
36
|
+
type: string
|
|
37
|
+
|
|
38
|
+
# MAS Details
|
|
39
|
+
- name: mas_instance_id
|
|
40
|
+
type: string
|
|
41
|
+
description: Instance ID
|
|
42
|
+
|
|
43
|
+
# Application - Operator
|
|
44
|
+
# - name: mas_aibroker_channel
|
|
45
|
+
- name: mas_app_channel
|
|
46
|
+
type: string
|
|
47
|
+
description: Catalog channel for the application operator subscription
|
|
48
|
+
|
|
49
|
+
# Application - Operand
|
|
50
|
+
- name: mas_app_bindings_jdbc
|
|
51
|
+
default: ""
|
|
52
|
+
type: string
|
|
53
|
+
|
|
54
|
+
- name: mas_app_plan
|
|
55
|
+
type: string
|
|
56
|
+
description: Application installation plan
|
|
57
|
+
default: ""
|
|
58
|
+
|
|
59
|
+
# Custom Label Support
|
|
60
|
+
- name: custom_labels
|
|
61
|
+
type: string
|
|
62
|
+
description: Optional MAS custom labels, comma separated list of key=value pairs
|
|
63
|
+
default: ""
|
|
64
|
+
|
|
65
|
+
# AI Broker actions
|
|
66
|
+
- name: mas_aibroker_s3_action
|
|
67
|
+
type: string
|
|
68
|
+
description:
|
|
69
|
+
default: "This option is optional"
|
|
70
|
+
- name: mas_aibroker_apikey_action
|
|
71
|
+
type: string
|
|
72
|
+
description:
|
|
73
|
+
default: "This option is optional"
|
|
74
|
+
|
|
75
|
+
# WatsonX params
|
|
76
|
+
- name: mas_aibroker_watsonxai_apikey
|
|
77
|
+
type: string
|
|
78
|
+
description:
|
|
79
|
+
default: "This option is mandatory"
|
|
80
|
+
- name: mas_aibroker_watsonxai_url
|
|
81
|
+
type: string
|
|
82
|
+
description:
|
|
83
|
+
default: "This option is mandatory"
|
|
84
|
+
- name: mas_aibroker_watsonxai_project_id
|
|
85
|
+
type: string
|
|
86
|
+
description:
|
|
87
|
+
default: "This option is mandatory"
|
|
88
|
+
- name: mas_aibroker_watsonx_action
|
|
89
|
+
type: string
|
|
90
|
+
description:
|
|
91
|
+
default: "This option is mandatory"
|
|
92
|
+
|
|
93
|
+
# AI Broker storage
|
|
94
|
+
- name: mas_aibroker_storage_provider
|
|
95
|
+
type: string
|
|
96
|
+
default: "This option is mandatory"
|
|
97
|
+
default: ""
|
|
98
|
+
- name: mas_aibroker_storage_accesskey
|
|
99
|
+
type: string
|
|
100
|
+
default: "This option is mandatory"
|
|
101
|
+
default: ""
|
|
102
|
+
- name: mas_aibroker_storage_secretkey
|
|
103
|
+
type: string
|
|
104
|
+
default: "This option is mandatory"
|
|
105
|
+
default: ""
|
|
106
|
+
- name: mas_aibroker_storage_host
|
|
107
|
+
type: string
|
|
108
|
+
default: "This option is mandatory"
|
|
109
|
+
default: ""
|
|
110
|
+
- name: mas_aibroker_storage_port
|
|
111
|
+
type: string
|
|
112
|
+
default: "This option is mandatory"
|
|
113
|
+
default: ""
|
|
114
|
+
- name: mas_aibroker_storage_ssl
|
|
115
|
+
type: string
|
|
116
|
+
default: "This option is mandatory"
|
|
117
|
+
default: ""
|
|
118
|
+
- name: mas_aibroker_storage_region
|
|
119
|
+
type: string
|
|
120
|
+
default: "This option is mandatory"
|
|
121
|
+
default: ""
|
|
122
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
123
|
+
type: string
|
|
124
|
+
default: "This option is mandatory"
|
|
125
|
+
default: ""
|
|
126
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
127
|
+
type: string
|
|
128
|
+
default: "This option is mandatory"
|
|
129
|
+
default: ""
|
|
130
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
131
|
+
type: string
|
|
132
|
+
default: "This option is mandatory"
|
|
133
|
+
default: ""
|
|
134
|
+
|
|
135
|
+
stepTemplate:
|
|
136
|
+
env:
|
|
137
|
+
- name: DEVOPS_MONGO_URI
|
|
138
|
+
valueFrom:
|
|
139
|
+
secretKeyRef:
|
|
140
|
+
name: mas-devops
|
|
141
|
+
key: DEVOPS_MONGO_URI
|
|
142
|
+
optional: true
|
|
143
|
+
- name: DEVOPS_BUILD_NUMBER
|
|
144
|
+
valueFrom:
|
|
145
|
+
secretKeyRef:
|
|
146
|
+
name: mas-devops
|
|
147
|
+
key: DEVOPS_BUILD_NUMBER
|
|
148
|
+
optional: true
|
|
149
|
+
- name: DEVOPS_ENVIRONMENT
|
|
150
|
+
valueFrom:
|
|
151
|
+
secretKeyRef:
|
|
152
|
+
name: mas-devops
|
|
153
|
+
key: MAS_INSTANCE_ID
|
|
154
|
+
optional: true
|
|
155
|
+
- name: DEVOPS_SUITE_NAME
|
|
156
|
+
value: $(params.devops_suite_name)
|
|
157
|
+
|
|
158
|
+
|
|
159
|
+
# Pre-Release Support
|
|
160
|
+
- name: ARTIFACTORY_USERNAME
|
|
161
|
+
value: $(params.artifactory_username)
|
|
162
|
+
- name: ARTIFACTORY_TOKEN
|
|
163
|
+
value: $(params.artifactory_token)
|
|
164
|
+
|
|
165
|
+
# Entitlement
|
|
166
|
+
- name: IBM_ENTITLEMENT_KEY
|
|
167
|
+
value: $(params.ibm_entitlement_key)
|
|
168
|
+
|
|
169
|
+
# MAS Details
|
|
170
|
+
- name: MAS_INSTANCE_ID
|
|
171
|
+
value: $(params.mas_instance_id)
|
|
172
|
+
|
|
173
|
+
# Application - Operator
|
|
174
|
+
# - name: MAS_AIBROKER_CHANNEL
|
|
175
|
+
# value: $(params.mas_aibroker_channel)
|
|
176
|
+
- name: MAS_APP_CHANNEL
|
|
177
|
+
value: $(params.mas_app_channel)
|
|
178
|
+
|
|
179
|
+
# Custom Label Support
|
|
180
|
+
- name: CUSTOM_LABELS
|
|
181
|
+
value: $(params.custom_labels)
|
|
182
|
+
|
|
183
|
+
# AI Broker action for create/delete s3 secret
|
|
184
|
+
- name: MAS_AIBROKER_S3_ACTION
|
|
185
|
+
value: $(params.mas_aibroker_s3_action)
|
|
186
|
+
|
|
187
|
+
# AI Broker action for create/delete api key
|
|
188
|
+
- name: MAS_AIBROKER_APIKEY_ACTION
|
|
189
|
+
value: $(params.mas_aibroker_apikey_action)
|
|
190
|
+
|
|
191
|
+
# WatsonX api key
|
|
192
|
+
- name: MAS_AIBROKER_WATSONXAI_APIKEY
|
|
193
|
+
value: $(params.mas_aibroker_watsonxai_apikey)
|
|
194
|
+
|
|
195
|
+
# WatsonX url
|
|
196
|
+
- name: MAS_AIBROKER_WATSONXAI_URL
|
|
197
|
+
value: $(params.mas_aibroker_watsonxai_url)
|
|
198
|
+
|
|
199
|
+
# WatsonX project id
|
|
200
|
+
- name: MAS_AIBROKER_WATSONXAI_PROJECT_ID
|
|
201
|
+
value: $(params.mas_aibroker_watsonxai_project_id)
|
|
202
|
+
|
|
203
|
+
# WatsonX action
|
|
204
|
+
- name: MAS_AIBROKER_WATSONX_ACTION
|
|
205
|
+
value: $(params.mas_aibroker_watsonx_action)
|
|
206
|
+
|
|
207
|
+
# Opendatahub storage details
|
|
208
|
+
- name: MAS_AIBROKER_STORAGE_PROVIDER
|
|
209
|
+
value: $(params.mas_aibroker_storage_provider)
|
|
210
|
+
- name: MAS_AIBROKER_STORAGE_ACCESSKEY
|
|
211
|
+
value: $(params.mas_aibroker_storage_accesskey)
|
|
212
|
+
- name: MAS_AIBROKER_STORAGE_SECRETKEY
|
|
213
|
+
value: $(params.mas_aibroker_storage_secretkey)
|
|
214
|
+
- name: MAS_AIBROKER_STORAGE_HOST
|
|
215
|
+
value: $(params.mas_aibroker_storage_host)
|
|
216
|
+
- name: MAS_AIBROKER_STORAGE_PORT
|
|
217
|
+
value: $(params.mas_aibroker_storage_port)
|
|
218
|
+
- name: MAS_AIBROKER_STORAGE_SSL
|
|
219
|
+
value: $(params.mas_aibroker_storage_ssl)
|
|
220
|
+
- name: MAS_AIBROKER_STORAGE_REGION
|
|
221
|
+
value: $(params.mas_aibroker_storage_region)
|
|
222
|
+
- name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
|
|
223
|
+
value: $(params.mas_aibroker_storage_pipelines_bucket)
|
|
224
|
+
- name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
|
|
225
|
+
value: $(params.mas_aibroker_storage_tenants_bucket)
|
|
226
|
+
- name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
|
|
227
|
+
value: $(params.mas_aibroker_storage_templates_bucket)
|
|
228
|
+
|
|
229
|
+
steps:
|
|
230
|
+
- name: aibroker
|
|
231
|
+
command:
|
|
232
|
+
- /opt/app-root/src/run-role.sh
|
|
233
|
+
- aibroker
|
|
234
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
235
|
+
imagePullPolicy: $(params.image_pull_policy)
|
|
2
236
|
# --------------------------------------------------------------------------------
|
|
3
237
|
# /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
|
|
4
238
|
# --------------------------------------------------------------------------------
|
|
@@ -108,7 +342,7 @@ spec:
|
|
|
108
342
|
command:
|
|
109
343
|
- /opt/app-root/src/run-role.sh
|
|
110
344
|
- appconnect
|
|
111
|
-
image: quay.io/ibmmas/cli:11.
|
|
345
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
112
346
|
imagePullPolicy: $(params.image_pull_policy)
|
|
113
347
|
workingDir: /workspace/configs
|
|
114
348
|
|
|
@@ -226,7 +460,7 @@ spec:
|
|
|
226
460
|
command:
|
|
227
461
|
- /opt/app-root/src/run-role.sh
|
|
228
462
|
- arcgis
|
|
229
|
-
image: quay.io/ibmmas/cli:11.
|
|
463
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
230
464
|
imagePullPolicy: $(params.image_pull_policy)
|
|
231
465
|
# --------------------------------------------------------------------------------
|
|
232
466
|
# /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
|
|
@@ -296,7 +530,7 @@ spec:
|
|
|
296
530
|
command:
|
|
297
531
|
- /opt/app-root/src/run-role.sh
|
|
298
532
|
- cert_manager
|
|
299
|
-
image: quay.io/ibmmas/cli:11.
|
|
533
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
300
534
|
imagePullPolicy: $(params.image_pull_policy)
|
|
301
535
|
workingDir: /workspace/configs
|
|
302
536
|
# --------------------------------------------------------------------------------
|
|
@@ -362,7 +596,7 @@ spec:
|
|
|
362
596
|
command:
|
|
363
597
|
- /opt/app-root/src/run-role.sh
|
|
364
598
|
- common_services
|
|
365
|
-
image: quay.io/ibmmas/cli:11.
|
|
599
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
366
600
|
imagePullPolicy: $(params.image_pull_policy)
|
|
367
601
|
workingDir: /workspace/configs
|
|
368
602
|
# --------------------------------------------------------------------------------
|
|
@@ -483,7 +717,7 @@ spec:
|
|
|
483
717
|
command:
|
|
484
718
|
- /opt/app-root/src/run-role.sh
|
|
485
719
|
- cos
|
|
486
|
-
image: quay.io/ibmmas/cli:11.
|
|
720
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
487
721
|
imagePullPolicy: $(params.image_pull_policy)
|
|
488
722
|
workingDir: /workspace/configs
|
|
489
723
|
|
|
@@ -603,7 +837,7 @@ spec:
|
|
|
603
837
|
command:
|
|
604
838
|
- /opt/app-root/src/run-role.sh
|
|
605
839
|
- cp4d_service
|
|
606
|
-
image: quay.io/ibmmas/cli:11.
|
|
840
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
607
841
|
imagePullPolicy: $(params.image_pull_policy)
|
|
608
842
|
workingDir: /workspace/configs
|
|
609
843
|
# --------------------------------------------------------------------------------
|
|
@@ -720,7 +954,7 @@ spec:
|
|
|
720
954
|
command:
|
|
721
955
|
- /opt/app-root/src/run-role.sh
|
|
722
956
|
- cp4d_service
|
|
723
|
-
image: quay.io/ibmmas/cli:11.
|
|
957
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
724
958
|
imagePullPolicy: $(params.image_pull_policy)
|
|
725
959
|
workingDir: /workspace/configs
|
|
726
960
|
|
|
@@ -826,7 +1060,7 @@ spec:
|
|
|
826
1060
|
command:
|
|
827
1061
|
- /opt/app-root/src/run-role.sh
|
|
828
1062
|
- cp4d
|
|
829
|
-
image: quay.io/ibmmas/cli:11.
|
|
1063
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
830
1064
|
imagePullPolicy: $(params.image_pull_policy)
|
|
831
1065
|
# --------------------------------------------------------------------------------
|
|
832
1066
|
# /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
|
|
@@ -1148,7 +1382,7 @@ spec:
|
|
|
1148
1382
|
command:
|
|
1149
1383
|
- /opt/app-root/src/run-role.sh
|
|
1150
1384
|
- db2
|
|
1151
|
-
image: quay.io/ibmmas/cli:11.
|
|
1385
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1152
1386
|
imagePullPolicy: $(params.image_pull_policy)
|
|
1153
1387
|
workingDir: /workspace/configs
|
|
1154
1388
|
|
|
@@ -1258,7 +1492,7 @@ spec:
|
|
|
1258
1492
|
command:
|
|
1259
1493
|
- /opt/app-root/src/run-role.sh
|
|
1260
1494
|
- eck
|
|
1261
|
-
image: quay.io/ibmmas/cli:11.
|
|
1495
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1262
1496
|
imagePullPolicy: $(params.image_pull_policy)
|
|
1263
1497
|
# --------------------------------------------------------------------------------
|
|
1264
1498
|
# /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
|
|
@@ -1347,7 +1581,7 @@ spec:
|
|
|
1347
1581
|
command:
|
|
1348
1582
|
- /opt/app-root/src/run-role.sh
|
|
1349
1583
|
- gencfg_workspace
|
|
1350
|
-
image: quay.io/ibmmas/cli:11.
|
|
1584
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1351
1585
|
imagePullPolicy: $(params.image_pull_policy)
|
|
1352
1586
|
workingDir: /workspace/configs
|
|
1353
1587
|
|
|
@@ -1451,7 +1685,7 @@ spec:
|
|
|
1451
1685
|
- -c
|
|
1452
1686
|
name: gitops-bootstrap
|
|
1453
1687
|
imagePullPolicy: IfNotPresent
|
|
1454
|
-
image: quay.io/ibmmas/cli:11.
|
|
1688
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1455
1689
|
workspaces:
|
|
1456
1690
|
- name: configs
|
|
1457
1691
|
# --------------------------------------------------------------------------------
|
|
@@ -1533,7 +1767,7 @@ spec:
|
|
|
1533
1767
|
- -c
|
|
1534
1768
|
name: gitops-cis-compliance
|
|
1535
1769
|
imagePullPolicy: IfNotPresent
|
|
1536
|
-
image: quay.io/ibmmas/cli:11.
|
|
1770
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1537
1771
|
workspaces:
|
|
1538
1772
|
- name: configs
|
|
1539
1773
|
# --------------------------------------------------------------------------------
|
|
@@ -1730,7 +1964,7 @@ spec:
|
|
|
1730
1964
|
- -c
|
|
1731
1965
|
name: gitops-cluster
|
|
1732
1966
|
imagePullPolicy: Always
|
|
1733
|
-
image: quay.io/ibmmas/cli:11.
|
|
1967
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1734
1968
|
workspaces:
|
|
1735
1969
|
- name: configs
|
|
1736
1970
|
# --------------------------------------------------------------------------------
|
|
@@ -1825,7 +2059,7 @@ spec:
|
|
|
1825
2059
|
- -c
|
|
1826
2060
|
name: gitops-cos
|
|
1827
2061
|
imagePullPolicy: IfNotPresent
|
|
1828
|
-
image: quay.io/ibmmas/cli:11.
|
|
2062
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1829
2063
|
workspaces:
|
|
1830
2064
|
- name: configs
|
|
1831
2065
|
# --------------------------------------------------------------------------------
|
|
@@ -1973,7 +2207,7 @@ spec:
|
|
|
1973
2207
|
- -c
|
|
1974
2208
|
name: gitops-cp4d-service
|
|
1975
2209
|
imagePullPolicy: IfNotPresent
|
|
1976
|
-
image: quay.io/ibmmas/cli:11.
|
|
2210
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
1977
2211
|
workspaces:
|
|
1978
2212
|
- name: configs
|
|
1979
2213
|
- name: shared-gitops-configs
|
|
@@ -2102,7 +2336,7 @@ spec:
|
|
|
2102
2336
|
- -c
|
|
2103
2337
|
name: gitops-cp4d
|
|
2104
2338
|
imagePullPolicy: IfNotPresent
|
|
2105
|
-
image: quay.io/ibmmas/cli:11.
|
|
2339
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2106
2340
|
workspaces:
|
|
2107
2341
|
- name: configs
|
|
2108
2342
|
- name: shared-gitops-configs
|
|
@@ -2354,7 +2588,7 @@ spec:
|
|
|
2354
2588
|
- -c
|
|
2355
2589
|
name: gitops-db2u-database
|
|
2356
2590
|
imagePullPolicy: Always
|
|
2357
|
-
image: quay.io/ibmmas/cli:11.
|
|
2591
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2358
2592
|
workspaces:
|
|
2359
2593
|
- name: configs
|
|
2360
2594
|
- name: shared-gitops-configs
|
|
@@ -2452,7 +2686,7 @@ spec:
|
|
|
2452
2686
|
- -c
|
|
2453
2687
|
name: gitops-db2u
|
|
2454
2688
|
imagePullPolicy: IfNotPresent
|
|
2455
|
-
image: quay.io/ibmmas/cli:11.
|
|
2689
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2456
2690
|
workspaces:
|
|
2457
2691
|
- name: configs
|
|
2458
2692
|
# --------------------------------------------------------------------------------
|
|
@@ -2579,7 +2813,7 @@ spec:
|
|
|
2579
2813
|
- -c
|
|
2580
2814
|
name: gitops-delete-jdbc-config
|
|
2581
2815
|
imagePullPolicy: IfNotPresent
|
|
2582
|
-
image: quay.io/ibmmas/cli:11.
|
|
2816
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2583
2817
|
workspaces:
|
|
2584
2818
|
- name: configs
|
|
2585
2819
|
# --------------------------------------------------------------------------------
|
|
@@ -2677,7 +2911,7 @@ spec:
|
|
|
2677
2911
|
- -c
|
|
2678
2912
|
name: gitops-delete-kafka-config
|
|
2679
2913
|
imagePullPolicy: Always
|
|
2680
|
-
image: quay.io/ibmmas/cli:11.
|
|
2914
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2681
2915
|
workspaces:
|
|
2682
2916
|
- name: configs
|
|
2683
2917
|
|
|
@@ -2769,7 +3003,7 @@ spec:
|
|
|
2769
3003
|
- -c
|
|
2770
3004
|
name: gitops-deprovision-app-config
|
|
2771
3005
|
imagePullPolicy: IfNotPresent
|
|
2772
|
-
image: quay.io/ibmmas/cli:11.
|
|
3006
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2773
3007
|
workspaces:
|
|
2774
3008
|
- name: configs
|
|
2775
3009
|
# --------------------------------------------------------------------------------
|
|
@@ -2854,7 +3088,7 @@ spec:
|
|
|
2854
3088
|
- -c
|
|
2855
3089
|
name: gitops-deprovision-app-install
|
|
2856
3090
|
imagePullPolicy: IfNotPresent
|
|
2857
|
-
image: quay.io/ibmmas/cli:11.
|
|
3091
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2858
3092
|
workspaces:
|
|
2859
3093
|
- name: configs
|
|
2860
3094
|
# --------------------------------------------------------------------------------
|
|
@@ -2939,7 +3173,7 @@ spec:
|
|
|
2939
3173
|
- -c
|
|
2940
3174
|
name: gitops-deprovision-cluster
|
|
2941
3175
|
imagePullPolicy: IfNotPresent
|
|
2942
|
-
image: quay.io/ibmmas/cli:11.
|
|
3176
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
2943
3177
|
workspaces:
|
|
2944
3178
|
- name: configs
|
|
2945
3179
|
# --------------------------------------------------------------------------------
|
|
@@ -3050,7 +3284,7 @@ spec:
|
|
|
3050
3284
|
- -c
|
|
3051
3285
|
name: gitops-deprovision-cos
|
|
3052
3286
|
imagePullPolicy: IfNotPresent
|
|
3053
|
-
image: quay.io/ibmmas/cli:11.
|
|
3287
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3054
3288
|
workspaces:
|
|
3055
3289
|
- name: configs
|
|
3056
3290
|
# --------------------------------------------------------------------------------
|
|
@@ -3138,7 +3372,7 @@ spec:
|
|
|
3138
3372
|
- -c
|
|
3139
3373
|
name: gitops-deprovision-db2u-database
|
|
3140
3374
|
imagePullPolicy: IfNotPresent
|
|
3141
|
-
image: quay.io/ibmmas/cli:11.
|
|
3375
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3142
3376
|
workspaces:
|
|
3143
3377
|
- name: configs
|
|
3144
3378
|
|
|
@@ -3221,7 +3455,7 @@ spec:
|
|
|
3221
3455
|
- -c
|
|
3222
3456
|
name: gitops-deprovision-db2u
|
|
3223
3457
|
imagePullPolicy: IfNotPresent
|
|
3224
|
-
image: quay.io/ibmmas/cli:11.
|
|
3458
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3225
3459
|
workspaces:
|
|
3226
3460
|
- name: configs
|
|
3227
3461
|
|
|
@@ -3285,19 +3519,51 @@ spec:
|
|
|
3285
3519
|
echo "Set k8s context"
|
|
3286
3520
|
export K8S_AUTH_CONTEXT=$(oc whoami -c)
|
|
3287
3521
|
|
|
3522
|
+
# Original shared EFS instance
|
|
3288
3523
|
mas gitops-deprovision-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
3289
|
-
|
|
3290
|
-
|
|
3291
|
-
|
|
3292
|
-
|
|
3524
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
3525
|
+
--aws-region $SM_AWS_REGION \
|
|
3526
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
3527
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
3528
|
+
|| exit 1
|
|
3529
|
+
|
|
3530
|
+
|
|
3531
|
+
# Additional PER MAS instance/dependency EFS instances
|
|
3532
|
+
# --skip-delete-storage-class is specified for these as the StorageClasses for these EFS instances are managed by ArgoCD
|
|
3533
|
+
|
|
3534
|
+
mas gitops-deprovision-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
3535
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
3536
|
+
--aws-region $SM_AWS_REGION \
|
|
3537
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
3538
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
3539
|
+
--efs-unique-id "efs-${CLUSTER_NAME}-${MAS_INSTANCE_ID}-iot-db2" \
|
|
3540
|
+
--skip-delete-storage-class \
|
|
3541
|
+
|| exit 1
|
|
3542
|
+
|
|
3543
|
+
mas gitops-deprovision-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
3544
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
3545
|
+
--aws-region $SM_AWS_REGION \
|
|
3546
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
3547
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
3548
|
+
--efs-unique-id "efs-${CLUSTER_NAME}-${MAS_INSTANCE_ID}-manage-db2" \
|
|
3549
|
+
--skip-delete-storage-class \
|
|
3550
|
+
|| exit 1
|
|
3551
|
+
|
|
3552
|
+
mas gitops-deprovision-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
3553
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
3554
|
+
--aws-region $SM_AWS_REGION \
|
|
3555
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
3556
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
3557
|
+
--efs-unique-id "efs-${CLUSTER_NAME}-${MAS_INSTANCE_ID}-visualinspection-main" \
|
|
3558
|
+
--skip-delete-storage-class \
|
|
3559
|
+
|| exit 1
|
|
3293
3560
|
|
|
3294
|
-
exit $?
|
|
3295
3561
|
command:
|
|
3296
3562
|
- /bin/sh
|
|
3297
3563
|
- -c
|
|
3298
3564
|
name: gitops-deprovision-efs
|
|
3299
3565
|
imagePullPolicy: IfNotPresent
|
|
3300
|
-
image: quay.io/ibmmas/cli:11.
|
|
3566
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3301
3567
|
workspaces:
|
|
3302
3568
|
- name: configs
|
|
3303
3569
|
|
|
@@ -3367,10 +3633,11 @@ spec:
|
|
|
3367
3633
|
aws configure set aws_secret_access_key $SM_AWS_SECRET_ACCESS_KEY
|
|
3368
3634
|
aws configure set default.region $(params.avp_aws_secret_region)
|
|
3369
3635
|
|
|
3370
|
-
|
|
3636
|
+
# Note the - after cluster name. this is to distinguish between different similar named clusters
|
|
3637
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
|
|
3371
3638
|
if [ -z "$vpc_name" ]; then
|
|
3372
3639
|
# Needed if there is only one cluster in account
|
|
3373
|
-
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
|
|
3640
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
|
|
3374
3641
|
fi
|
|
3375
3642
|
export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
|
|
3376
3643
|
|
|
@@ -3406,7 +3673,7 @@ spec:
|
|
|
3406
3673
|
- -c
|
|
3407
3674
|
name: gitops-deprovision-kafka
|
|
3408
3675
|
imagePullPolicy: IfNotPresent
|
|
3409
|
-
image: quay.io/ibmmas/cli:11.
|
|
3676
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3410
3677
|
workspaces:
|
|
3411
3678
|
- name: configs
|
|
3412
3679
|
# --------------------------------------------------------------------------------
|
|
@@ -3467,10 +3734,11 @@ spec:
|
|
|
3467
3734
|
aws configure set aws_secret_access_key $SM_AWS_SECRET_ACCESS_KEY
|
|
3468
3735
|
aws configure set default.region $(params.avp_aws_secret_region)
|
|
3469
3736
|
|
|
3470
|
-
|
|
3737
|
+
# Note the - after cluster name. this is to distinguish between different similar named clusters
|
|
3738
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
|
|
3471
3739
|
if [ -z "$vpc_name" ]; then
|
|
3472
3740
|
# Needed if there is only one cluster in account
|
|
3473
|
-
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
|
|
3741
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
|
|
3474
3742
|
fi
|
|
3475
3743
|
export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
|
|
3476
3744
|
|
|
@@ -3508,7 +3776,7 @@ spec:
|
|
|
3508
3776
|
- -c
|
|
3509
3777
|
name: gitops-deprovision-mongo
|
|
3510
3778
|
imagePullPolicy: IfNotPresent
|
|
3511
|
-
image: quay.io/ibmmas/cli:11.
|
|
3779
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3512
3780
|
workspaces:
|
|
3513
3781
|
- name: configs
|
|
3514
3782
|
|
|
@@ -3565,7 +3833,7 @@ spec:
|
|
|
3565
3833
|
- -c
|
|
3566
3834
|
name: gitops-deprovision-rosa
|
|
3567
3835
|
imagePullPolicy: IfNotPresent
|
|
3568
|
-
image: quay.io/ibmmas/cli:11.
|
|
3836
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3569
3837
|
workspaces:
|
|
3570
3838
|
- name: configs
|
|
3571
3839
|
# --------------------------------------------------------------------------------
|
|
@@ -3770,7 +4038,7 @@ spec:
|
|
|
3770
4038
|
- -c
|
|
3771
4039
|
name: gitops-deprovision-suite-config
|
|
3772
4040
|
imagePullPolicy: IfNotPresent
|
|
3773
|
-
image: quay.io/ibmmas/cli:11.
|
|
4041
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3774
4042
|
workspaces:
|
|
3775
4043
|
- name: configs
|
|
3776
4044
|
|
|
@@ -3868,7 +4136,7 @@ spec:
|
|
|
3868
4136
|
- -c
|
|
3869
4137
|
name: gitops-deprovision-suite-idp-config
|
|
3870
4138
|
imagePullPolicy: IfNotPresent
|
|
3871
|
-
image: quay.io/ibmmas/cli:11.
|
|
4139
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3872
4140
|
workspaces:
|
|
3873
4141
|
- name: configs
|
|
3874
4142
|
# --------------------------------------------------------------------------------
|
|
@@ -3960,7 +4228,7 @@ spec:
|
|
|
3960
4228
|
- -c
|
|
3961
4229
|
name: gitops-deprovision-suite-objectstorage-config
|
|
3962
4230
|
imagePullPolicy: IfNotPresent
|
|
3963
|
-
image: quay.io/ibmmas/cli:11.
|
|
4231
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
3964
4232
|
workspaces:
|
|
3965
4233
|
- name: configs
|
|
3966
4234
|
# --------------------------------------------------------------------------------
|
|
@@ -4052,7 +4320,7 @@ spec:
|
|
|
4052
4320
|
- -c
|
|
4053
4321
|
name: gitops-deprovision-suite-smtp-config
|
|
4054
4322
|
imagePullPolicy: IfNotPresent
|
|
4055
|
-
image: quay.io/ibmmas/cli:11.
|
|
4323
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4056
4324
|
workspaces:
|
|
4057
4325
|
- name: configs
|
|
4058
4326
|
# --------------------------------------------------------------------------------
|
|
@@ -4145,7 +4413,7 @@ spec:
|
|
|
4145
4413
|
- -c
|
|
4146
4414
|
name: gitops-deprovision-suite-watson-studio-config
|
|
4147
4415
|
imagePullPolicy: IfNotPresent
|
|
4148
|
-
image: quay.io/ibmmas/cli:11.
|
|
4416
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4149
4417
|
workspaces:
|
|
4150
4418
|
- name: configs
|
|
4151
4419
|
# --------------------------------------------------------------------------------
|
|
@@ -4236,7 +4504,7 @@ spec:
|
|
|
4236
4504
|
- -c
|
|
4237
4505
|
name: gitops-deprovision-suite-workspace
|
|
4238
4506
|
imagePullPolicy: Always
|
|
4239
|
-
image: quay.io/ibmmas/cli:11.
|
|
4507
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4240
4508
|
workspaces:
|
|
4241
4509
|
- name: configs
|
|
4242
4510
|
# --------------------------------------------------------------------------------
|
|
@@ -4329,7 +4597,7 @@ spec:
|
|
|
4329
4597
|
- -c
|
|
4330
4598
|
name: gitops-deprovision-suite
|
|
4331
4599
|
imagePullPolicy: IfNotPresent
|
|
4332
|
-
image: quay.io/ibmmas/cli:11.
|
|
4600
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4333
4601
|
workspaces:
|
|
4334
4602
|
- name: configs
|
|
4335
4603
|
|
|
@@ -4442,7 +4710,7 @@ spec:
|
|
|
4442
4710
|
- -c
|
|
4443
4711
|
name: gitops-dro
|
|
4444
4712
|
imagePullPolicy: IfNotPresent
|
|
4445
|
-
image: quay.io/ibmmas/cli:11.
|
|
4713
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4446
4714
|
workspaces:
|
|
4447
4715
|
- name: configs
|
|
4448
4716
|
# --------------------------------------------------------------------------------
|
|
@@ -4512,19 +4780,54 @@ spec:
|
|
|
4512
4780
|
echo "Set k8s context"
|
|
4513
4781
|
export K8S_AUTH_CONTEXT=$(oc whoami -c)
|
|
4514
4782
|
|
|
4783
|
+
# Original shared EFS instance
|
|
4515
4784
|
mas gitops-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
4516
|
-
|
|
4517
|
-
|
|
4518
|
-
|
|
4519
|
-
|
|
4785
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
4786
|
+
--aws-region $SM_AWS_REGION \
|
|
4787
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
4788
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
4789
|
+
|| exit 1
|
|
4790
|
+
|
|
4791
|
+
|
|
4792
|
+
# Additional PER MAS instance/dependency EFS instances
|
|
4793
|
+
# --skip-create-storage-class is specified for these as the StorageClasses for these EFS instances are managed by ArgoCD
|
|
4794
|
+
|
|
4795
|
+
mas gitops-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
4796
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
4797
|
+
--aws-region $SM_AWS_REGION \
|
|
4798
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
4799
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
4800
|
+
--creation-token-prefix "" \
|
|
4801
|
+
--efs-unique-id "efs-${CLUSTER_NAME}-${MAS_INSTANCE_ID}-iot-db2" \
|
|
4802
|
+
--skip-create-storage-class \
|
|
4803
|
+
|| exit 1
|
|
4804
|
+
|
|
4805
|
+
mas gitops-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
4806
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
4807
|
+
--aws-region $SM_AWS_REGION \
|
|
4808
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
4809
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
4810
|
+
--creation-token-prefix "" \
|
|
4811
|
+
--efs-unique-id "efs-${CLUSTER_NAME}-${MAS_INSTANCE_ID}-manage-db2" \
|
|
4812
|
+
--skip-create-storage-class \
|
|
4813
|
+
|| exit 1
|
|
4814
|
+
|
|
4815
|
+
mas gitops-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
|
|
4816
|
+
--cloud-provider $CLOUD_PROVIDER \
|
|
4817
|
+
--aws-region $SM_AWS_REGION \
|
|
4818
|
+
--aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
|
|
4819
|
+
--aws-access-key $SM_AWS_ACCESS_KEY_ID \
|
|
4820
|
+
--creation-token-prefix "" \
|
|
4821
|
+
--efs-unique-id "efs-${CLUSTER_NAME}-${MAS_INSTANCE_ID}-visualinspection-main" \
|
|
4822
|
+
--skip-create-storage-class \
|
|
4823
|
+
|| exit 1
|
|
4520
4824
|
|
|
4521
|
-
exit $?
|
|
4522
4825
|
command:
|
|
4523
4826
|
- /bin/sh
|
|
4524
4827
|
- -c
|
|
4525
4828
|
name: gitops-efs
|
|
4526
4829
|
imagePullPolicy: IfNotPresent
|
|
4527
|
-
image: quay.io/ibmmas/cli:11.
|
|
4830
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4528
4831
|
workspaces:
|
|
4529
4832
|
- name: configs
|
|
4530
4833
|
|
|
@@ -4659,7 +4962,7 @@ spec:
|
|
|
4659
4962
|
- -c
|
|
4660
4963
|
name: gitops-jdbc-config
|
|
4661
4964
|
imagePullPolicy: Always
|
|
4662
|
-
image: quay.io/ibmmas/cli:11.
|
|
4965
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4663
4966
|
workspaces:
|
|
4664
4967
|
- name: configs
|
|
4665
4968
|
- name: shared-gitops-configs
|
|
@@ -4755,7 +5058,7 @@ spec:
|
|
|
4755
5058
|
- -c
|
|
4756
5059
|
name: gitops-kafka-config
|
|
4757
5060
|
imagePullPolicy: Always
|
|
4758
|
-
image: quay.io/ibmmas/cli:11.
|
|
5061
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4759
5062
|
workspaces:
|
|
4760
5063
|
- name: configs
|
|
4761
5064
|
|
|
@@ -4837,10 +5140,11 @@ spec:
|
|
|
4837
5140
|
aws configure set aws_secret_access_key $(params.avp_aws_secret_key)
|
|
4838
5141
|
aws configure set default.region $(params.avp_aws_secret_region)
|
|
4839
5142
|
|
|
4840
|
-
|
|
5143
|
+
# Note the - after cluster name. this is to distinguish between different similar named clusters
|
|
5144
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
|
|
4841
5145
|
if [ -z "$vpc_name" ]; then
|
|
4842
5146
|
# Needed if there is only one cluster in account
|
|
4843
|
-
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
|
|
5147
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
|
|
4844
5148
|
fi
|
|
4845
5149
|
export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
|
|
4846
5150
|
|
|
@@ -4876,7 +5180,7 @@ spec:
|
|
|
4876
5180
|
- -c
|
|
4877
5181
|
name: gitops-kafka
|
|
4878
5182
|
imagePullPolicy: IfNotPresent
|
|
4879
|
-
image: quay.io/ibmmas/cli:11.
|
|
5183
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4880
5184
|
workspaces:
|
|
4881
5185
|
- name: configs
|
|
4882
5186
|
# --------------------------------------------------------------------------------
|
|
@@ -4927,7 +5231,7 @@ spec:
|
|
|
4927
5231
|
- -c
|
|
4928
5232
|
name: gitops-license
|
|
4929
5233
|
imagePullPolicy: Always
|
|
4930
|
-
image: quay.io/ibmmas/cli:11.
|
|
5234
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
4931
5235
|
workspaces:
|
|
4932
5236
|
- name: shared-entitlement
|
|
4933
5237
|
|
|
@@ -4971,6 +5275,8 @@ spec:
|
|
|
4971
5275
|
type: string
|
|
4972
5276
|
- name: fvt_version_ctf
|
|
4973
5277
|
type: string
|
|
5278
|
+
- name: fvt_version_predict
|
|
5279
|
+
type: string
|
|
4974
5280
|
- name: fvt_version_assist
|
|
4975
5281
|
type: string
|
|
4976
5282
|
- name: fvt_version_iot
|
|
@@ -5148,6 +5454,8 @@ spec:
|
|
|
5148
5454
|
value: $(params.ivt_version_core)
|
|
5149
5455
|
- name: FVT_VERSION_CTF
|
|
5150
5456
|
value: $(params.fvt_version_ctf)
|
|
5457
|
+
- name: FVT_VERSION_PREDICT
|
|
5458
|
+
value: $(params.fvt_version_predict)
|
|
5151
5459
|
- name: FVT_VERSION_ASSIST
|
|
5152
5460
|
value: $(params.fvt_version_assist)
|
|
5153
5461
|
- name: FVT_VERSION_IOT
|
|
@@ -5426,7 +5734,7 @@ spec:
|
|
|
5426
5734
|
- -c
|
|
5427
5735
|
name: gitops-mas-fvt-preparer
|
|
5428
5736
|
imagePullPolicy: Always
|
|
5429
|
-
image: quay.io/ibmmas/cli:11.
|
|
5737
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
5430
5738
|
workspaces:
|
|
5431
5739
|
- name: configs
|
|
5432
5740
|
- name: shared-additional-configs
|
|
@@ -5466,6 +5774,8 @@ spec:
|
|
|
5466
5774
|
type: string
|
|
5467
5775
|
- name: mas_operationalmode
|
|
5468
5776
|
type: string
|
|
5777
|
+
- name: mas_instance_id
|
|
5778
|
+
type: string
|
|
5469
5779
|
- name: mas_app_channel_assist
|
|
5470
5780
|
type: string
|
|
5471
5781
|
- name: mas_app_install_plan_assist
|
|
@@ -5567,6 +5877,8 @@ spec:
|
|
|
5567
5877
|
value: $(params.mas_channel)
|
|
5568
5878
|
- name: MAS_OPERATIONALMODE
|
|
5569
5879
|
value: $(params.mas_operationalmode)
|
|
5880
|
+
- name: MAS_INSTANCE_ID
|
|
5881
|
+
value: $(params.mas_instance_id)
|
|
5570
5882
|
- name: MAS_APP_CHANNEL_ASSIST
|
|
5571
5883
|
value: $(params.mas_app_channel_assist)
|
|
5572
5884
|
- name: MAS_APP_INSTALL_PLAN_ASSIST
|
|
@@ -5682,17 +5994,16 @@ spec:
|
|
|
5682
5994
|
|
|
5683
5995
|
git clone https://git:$GITHUB_PAT@$GITHUB_HOST/$SOURCE_GITHUB_ORG/devops-configs.git -b master || exit
|
|
5684
5996
|
|
|
5685
|
-
|
|
5686
|
-
mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/fvtsaas/manual-certs
|
|
5997
|
+
mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/manual-certs
|
|
5687
5998
|
|
|
5688
|
-
# Copy manual certs of
|
|
5689
|
-
cp -r $TARGET_LOCAL_DIR/manual-certs/devops-configs/certs
|
|
5999
|
+
# Copy manual certs of mas_instance
|
|
6000
|
+
cp -r $TARGET_LOCAL_DIR/manual-certs/devops-configs/certs/$MAS_INSTANCE_ID/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/manual-certs
|
|
5690
6001
|
|
|
5691
6002
|
# Invoke create-aggregate-manual-certs.sh to generate combined_manual_certs.yaml
|
|
5692
6003
|
|
|
5693
6004
|
chmod +x $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/create-aggregate-manual-certs.sh
|
|
5694
6005
|
|
|
5695
|
-
$TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/create-aggregate-manual-certs.sh $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6006
|
+
$TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/create-aggregate-manual-certs.sh $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/manual-certs
|
|
5696
6007
|
|
|
5697
6008
|
# Remove manual-certs folder
|
|
5698
6009
|
rm -rf $TARGET_LOCAL_DIR/manual-certs
|
|
@@ -5701,40 +6012,40 @@ spec:
|
|
|
5701
6012
|
cd $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO
|
|
5702
6013
|
|
|
5703
6014
|
if [[ "${MANUAL_CERTS_CONTROL_FLAG}" != "true" ]]; then
|
|
5704
|
-
yq -i 'del(.dns.manual_certs)' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6015
|
+
yq -i 'del(.dns.manual_certs)' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
|
|
5705
6016
|
echo "gitops-mas-initiator: removed .dns.manual_certs node"
|
|
5706
6017
|
fi
|
|
5707
6018
|
|
|
5708
|
-
# Update the domain name in the mas-instance-params.yaml.
|
|
6019
|
+
# Update the domain name in the mas-instance-params.yaml.
|
|
5709
6020
|
export ROSA_CONFIG=/workspace/configs/tmp-rosa/rosa-$(params.cluster_name)-details.yaml
|
|
5710
6021
|
export OCP_SERVER=$(cat $ROSA_CONFIG | yq '.data.api_url')
|
|
5711
6022
|
export DOMAIN=$(echo -n $OCP_SERVER | sed -n -e 's/^.*api.//p' | cut -d: -f1)
|
|
5712
|
-
export MASDOMAIN
|
|
6023
|
+
export MASDOMAIN=$MAS_INSTANCE_ID.apps.$DOMAIN
|
|
5713
6024
|
export APPSDOMAIN=apps.$DOMAIN
|
|
5714
6025
|
|
|
5715
|
-
yq -i '.mas_instance.domain = env(MASDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6026
|
+
yq -i '.mas_instance.domain = env(MASDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
|
|
5716
6027
|
|
|
5717
|
-
# Update the ocp server url & ingress domain url in the cluster-params.yaml.
|
|
6028
|
+
# Update the ocp server url & ingress domain url in the cluster-params.yaml.
|
|
5718
6029
|
yq -i '.cluster.url = env(OCP_SERVER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
|
|
5719
6030
|
yq -i '.cluster.domain = env(APPSDOMAIN)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
|
|
5720
6031
|
|
|
5721
|
-
# Update the channel in the mas-instance-params.yaml.
|
|
5722
|
-
yq -i '.mas_instance.channel = env(MAS_CHANNEL)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6032
|
+
# Update the channel in the mas-instance-params.yaml.
|
|
6033
|
+
yq -i '.mas_instance.channel = env(MAS_CHANNEL)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
|
|
5723
6034
|
|
|
5724
|
-
# Update the operationalmode in the mas-instance-params.yaml.
|
|
5725
|
-
yq -i '.mas_instance.annotations."mas.ibm.com/operationalMode" = env(MAS_OPERATIONALMODE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6035
|
+
# Update the operationalmode in the mas-instance-params.yaml.
|
|
6036
|
+
yq -i '.mas_instance.annotations."mas.ibm.com/operationalMode" = env(MAS_OPERATIONALMODE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
|
|
5726
6037
|
|
|
5727
6038
|
# Remove dns node when DNS_PROVIDER_CONTROL_IDEN is not set
|
|
5728
6039
|
if [ "${DNS_PROVIDER_CONTROL_IDEN}" == "" ]; then
|
|
5729
|
-
yq -i 'del(.dns)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6040
|
+
yq -i 'del(.dns)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
|
|
5730
6041
|
yq -i 'del(.cluster.dns)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
|
|
5731
|
-
echo "gitops-mas-initiator: removed .dns / .cluster.dns node from gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6042
|
+
echo "gitops-mas-initiator: removed .dns / .cluster.dns node from gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml & gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml"
|
|
5732
6043
|
fi
|
|
5733
6044
|
|
|
5734
6045
|
# Deploy fvtsaas with CIS as DNS provider and Manual_certs=True on Mon, Tue, Wed, Thu, Fri
|
|
5735
6046
|
# Deploy fvtsaas with CIS as DNS provider and Manual_certs=False on Sun
|
|
5736
6047
|
|
|
5737
|
-
yq -i '.mas_instance.manual_cert_mgmt = env(MANUAL_CERTS_CONTROL_FLAG)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6048
|
+
yq -i '.mas_instance.manual_cert_mgmt = env(MANUAL_CERTS_CONTROL_FLAG)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
|
|
5738
6049
|
echo "gitops-mas-initiator: .mas_instance.manual_cert_mgmt set to $MANUAL_CERTS_CONTROL_FLAG"
|
|
5739
6050
|
|
|
5740
6051
|
if [[ "${DNS_PROVIDER_CONTROL_IDEN}" == "cis" ]]; then
|
|
@@ -5743,13 +6054,13 @@ spec:
|
|
|
5743
6054
|
fi
|
|
5744
6055
|
|
|
5745
6056
|
#customizationList customizationArchive credentials
|
|
5746
|
-
if [ -f "gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6057
|
+
if [ -f "gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/appws_spec_manage.yaml" ]; then
|
|
5747
6058
|
|
|
5748
|
-
MAS_APPWS_SPEC_YAML=gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6059
|
+
MAS_APPWS_SPEC_YAML=gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/appws_spec_manage.yaml
|
|
5749
6060
|
secret_names=$(yq eval '.mas_appws_spec.settings.customizationList | to_entries | .[].value.customizationArchiveCredentials.secretName' ${MAS_APPWS_SPEC_YAML})
|
|
5750
6061
|
for customization_archive_secret_name in ${secret_names[@]}; do
|
|
5751
6062
|
|
|
5752
|
-
export CUSTOMIZATION_ARCHIVE_SECRET=${ACCOUNT}${SECRETS_KEY_SEPERATOR}${CLUSTER_NAME}${SECRETS_KEY_SEPERATOR}
|
|
6063
|
+
export CUSTOMIZATION_ARCHIVE_SECRET=${ACCOUNT}${SECRETS_KEY_SEPERATOR}${CLUSTER_NAME}${SECRETS_KEY_SEPERATOR}$MAS_INSTANCE_ID${SECRETS_KEY_SEPERATOR}
|
|
5753
6064
|
export CUSTOMIZATION_ARCHIVE_SECRET_NAME=${CUSTOMIZATION_ARCHIVE_SECRET}${customization_archive_secret_name}
|
|
5754
6065
|
echo "gitops-mas-initiator: creating AWS SM with name :: ${CUSTOMIZATION_ARCHIVE_SECRET_NAME}"
|
|
5755
6066
|
|
|
@@ -5776,40 +6087,40 @@ spec:
|
|
|
5776
6087
|
done
|
|
5777
6088
|
|
|
5778
6089
|
fi
|
|
5779
|
-
# Update the app channels in the mas-apps-params.yaml.
|
|
6090
|
+
# Update the app channels in the mas-apps-params.yaml.
|
|
5780
6091
|
if [ -n $MAS_APP_CHANNEL_ASSIST ]; then
|
|
5781
|
-
yq -i '(. | select(has("assist")) | .assist.app_channel) = env(MAS_APP_CHANNEL_ASSIST)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6092
|
+
yq -i '(. | select(has("assist")) | .assist.app_channel) = env(MAS_APP_CHANNEL_ASSIST)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5782
6093
|
# Assist not supported in v8 due to no CP4D WD support
|
|
5783
6094
|
if [[ "$MAS_APP_CHANNEL_ASSIST" =~ ^8\. ]]; then
|
|
5784
|
-
yq -i 'del(.assist)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6095
|
+
yq -i 'del(.assist)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5785
6096
|
echo "gitops-mas-initiator: removed .assist node"
|
|
5786
|
-
yq -i '.launchfvt.assist = false' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6097
|
+
yq -i '.launchfvt.assist = false' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
|
|
5787
6098
|
echo "gitops-mas-initiator: set .launchfvt.assist to false"
|
|
5788
6099
|
fi
|
|
5789
6100
|
fi
|
|
5790
6101
|
if [ -n $MAS_APP_CHANNEL_IOT ]; then
|
|
5791
|
-
yq -i '(. | select(has("iot")) | .iot.app_channel) = env(MAS_APP_CHANNEL_IOT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6102
|
+
yq -i '(. | select(has("iot")) | .iot.app_channel) = env(MAS_APP_CHANNEL_IOT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5792
6103
|
fi
|
|
5793
6104
|
if [ -n $MAS_APP_CHANNEL_MANAGE ]; then
|
|
5794
|
-
yq -i '(. | select(has("manage")) | .manage.app_channel) = env(MAS_APP_CHANNEL_MANAGE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6105
|
+
yq -i '(. | select(has("manage")) | .manage.app_channel) = env(MAS_APP_CHANNEL_MANAGE)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5795
6106
|
fi
|
|
5796
6107
|
if [ -n $MAS_APP_CHANNEL_MONITOR ]; then
|
|
5797
|
-
yq -i '(. | select(has("monitor")) | .monitor.app_channel) = env(MAS_APP_CHANNEL_MONITOR)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6108
|
+
yq -i '(. | select(has("monitor")) | .monitor.app_channel) = env(MAS_APP_CHANNEL_MONITOR)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5798
6109
|
fi
|
|
5799
6110
|
if [ -n $MAS_APP_CHANNEL_OPTIMIZER ]; then
|
|
5800
|
-
yq -i '(. | select(has("optimizer")) | .optimizer.app_channel) = env(MAS_APP_CHANNEL_OPTIMIZER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6111
|
+
yq -i '(. | select(has("optimizer")) | .optimizer.app_channel) = env(MAS_APP_CHANNEL_OPTIMIZER)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5801
6112
|
fi
|
|
5802
6113
|
if [ -n $MAS_APP_CHANNEL_PREDICT ]; then
|
|
5803
|
-
yq -i '(. | select(has("predict")) | .predict.app_channel) = env(MAS_APP_CHANNEL_PREDICT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6114
|
+
yq -i '(. | select(has("predict")) | .predict.app_channel) = env(MAS_APP_CHANNEL_PREDICT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5804
6115
|
fi
|
|
5805
6116
|
if [ -n $MAS_APP_CHANNEL_VISUALINSPECTION ]; then
|
|
5806
|
-
yq -i '(. | select(has("visualinspection")) | .visualinspection.app_channel) = env(MAS_APP_CHANNEL_VISUALINSPECTION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6117
|
+
yq -i '(. | select(has("visualinspection")) | .visualinspection.app_channel) = env(MAS_APP_CHANNEL_VISUALINSPECTION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
|
|
5807
6118
|
fi
|
|
5808
6119
|
|
|
5809
6120
|
# Update the cli_version and ansible_fvt ansible version if mas_fvt_params exists
|
|
5810
|
-
if [ -f gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
5811
|
-
yq -i '.fvt.cli_version = env(CLI_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
5812
|
-
yq -i '.fvt.ansible_version = env(FVT_ANSIBLE_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/
|
|
6121
|
+
if [ -f gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml ]; then
|
|
6122
|
+
yq -i '.fvt.cli_version = env(CLI_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
|
|
6123
|
+
yq -i '.fvt.ansible_version = env(FVT_ANSIBLE_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
|
|
5813
6124
|
fi
|
|
5814
6125
|
|
|
5815
6126
|
echo "git: Adding all files in $TARGET_LOCAL_DIR working directory"
|
|
@@ -5865,7 +6176,7 @@ spec:
|
|
|
5865
6176
|
- -c
|
|
5866
6177
|
name: gitops-mas-initiator
|
|
5867
6178
|
imagePullPolicy: IfNotPresent
|
|
5868
|
-
image: quay.io/ibmmas/cli:11.
|
|
6179
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
5869
6180
|
workspaces:
|
|
5870
6181
|
- name: configs
|
|
5871
6182
|
# --------------------------------------------------------------------------------
|
|
@@ -5931,10 +6242,11 @@ spec:
|
|
|
5931
6242
|
aws configure set aws_secret_access_key $(params.avp_aws_secret_key)
|
|
5932
6243
|
aws configure set default.region $(params.avp_aws_secret_region)
|
|
5933
6244
|
|
|
5934
|
-
|
|
6245
|
+
# Note the - after cluster name. this is to distinguish between different similar named clusters
|
|
6246
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
|
|
5935
6247
|
if [ -z "$vpc_name" ]; then
|
|
5936
6248
|
# Needed if there is only one cluster in account
|
|
5937
|
-
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
|
|
6249
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
|
|
5938
6250
|
fi
|
|
5939
6251
|
export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
|
|
5940
6252
|
|
|
@@ -5972,7 +6284,7 @@ spec:
|
|
|
5972
6284
|
- -c
|
|
5973
6285
|
name: gitops-mongo
|
|
5974
6286
|
imagePullPolicy: IfNotPresent
|
|
5975
|
-
image: quay.io/ibmmas/cli:11.
|
|
6287
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
5976
6288
|
workspaces:
|
|
5977
6289
|
- name: configs
|
|
5978
6290
|
|
|
@@ -6094,7 +6406,7 @@ spec:
|
|
|
6094
6406
|
- -c
|
|
6095
6407
|
name: gitops-nvidia-gpu
|
|
6096
6408
|
imagePullPolicy: IfNotPresent
|
|
6097
|
-
image: quay.io/ibmmas/cli:11.
|
|
6409
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6098
6410
|
workspaces:
|
|
6099
6411
|
- name: configs
|
|
6100
6412
|
# --------------------------------------------------------------------------------
|
|
@@ -6167,10 +6479,11 @@ spec:
|
|
|
6167
6479
|
aws configure set aws_secret_access_key $SM_AWS_SECRET_ACCESS_KEY
|
|
6168
6480
|
aws configure set default.region $(params.avp_aws_secret_region)
|
|
6169
6481
|
|
|
6170
|
-
|
|
6482
|
+
# Note the - after cluster name. this is to distinguish between different similar named clusters
|
|
6483
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.[].Value')
|
|
6171
6484
|
if [ -z "$vpc_name" ]; then
|
|
6172
6485
|
# Needed if there is only one cluster in account
|
|
6173
|
-
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME | yq '.Value')
|
|
6486
|
+
vpc_name=$(aws ec2 describe-vpcs --output yaml | grep $CLUSTER_NAME- | yq '.Value')
|
|
6174
6487
|
fi
|
|
6175
6488
|
export VPC_ID=$(aws ec2 describe-vpcs --filters '[{"Name": "tag:Name", "Values": ["'$vpc_name'"]}]' --output yaml | yq '.Vpcs[].VpcId' )
|
|
6176
6489
|
|
|
@@ -6211,7 +6524,7 @@ spec:
|
|
|
6211
6524
|
- -c
|
|
6212
6525
|
name: gitops-process-mongo-user
|
|
6213
6526
|
imagePullPolicy: IfNotPresent
|
|
6214
|
-
image: quay.io/ibmmas/cli:11.
|
|
6527
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6215
6528
|
workspaces:
|
|
6216
6529
|
- name: configs
|
|
6217
6530
|
# --------------------------------------------------------------------------------
|
|
@@ -6267,7 +6580,7 @@ spec:
|
|
|
6267
6580
|
- -c
|
|
6268
6581
|
name: gitops-rosa
|
|
6269
6582
|
imagePullPolicy: IfNotPresent
|
|
6270
|
-
image: quay.io/ibmmas/cli:11.
|
|
6583
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6271
6584
|
workspaces:
|
|
6272
6585
|
- name: configs
|
|
6273
6586
|
# --------------------------------------------------------------------------------
|
|
@@ -6449,7 +6762,7 @@ spec:
|
|
|
6449
6762
|
- -c
|
|
6450
6763
|
name: gitops-suite-app-config
|
|
6451
6764
|
imagePullPolicy: IfNotPresent
|
|
6452
|
-
image: quay.io/ibmmas/cli:11.
|
|
6765
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6453
6766
|
workspaces:
|
|
6454
6767
|
- name: configs
|
|
6455
6768
|
- name: shared-gitops-configs
|
|
@@ -6607,7 +6920,7 @@ spec:
|
|
|
6607
6920
|
- -c
|
|
6608
6921
|
name: gitops-suite-app-install
|
|
6609
6922
|
imagePullPolicy: Always
|
|
6610
|
-
image: quay.io/ibmmas/cli:11.
|
|
6923
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6611
6924
|
workspaces:
|
|
6612
6925
|
- name: configs
|
|
6613
6926
|
- name: shared-gitops-configs
|
|
@@ -6713,7 +7026,7 @@ spec:
|
|
|
6713
7026
|
- -c
|
|
6714
7027
|
name: gitops-suite-certs
|
|
6715
7028
|
imagePullPolicy: IfNotPresent
|
|
6716
|
-
image: quay.io/ibmmas/cli:11.
|
|
7029
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6717
7030
|
workspaces:
|
|
6718
7031
|
- name: configs
|
|
6719
7032
|
- name: certificates
|
|
@@ -6873,7 +7186,7 @@ spec:
|
|
|
6873
7186
|
- -c
|
|
6874
7187
|
name: gitops-suite-config
|
|
6875
7188
|
imagePullPolicy: IfNotPresent
|
|
6876
|
-
image: quay.io/ibmmas/cli:11.
|
|
7189
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6877
7190
|
workspaces:
|
|
6878
7191
|
- name: configs
|
|
6879
7192
|
- name: shared-additional-configs
|
|
@@ -6973,7 +7286,7 @@ spec:
|
|
|
6973
7286
|
- -c
|
|
6974
7287
|
name: gitops-suite-dns
|
|
6975
7288
|
imagePullPolicy: IfNotPresent
|
|
6976
|
-
image: quay.io/ibmmas/cli:11.
|
|
7289
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
6977
7290
|
workspaces:
|
|
6978
7291
|
- name: configs
|
|
6979
7292
|
|
|
@@ -7097,7 +7410,7 @@ spec:
|
|
|
7097
7410
|
- -c
|
|
7098
7411
|
name: gitops-suite-idp-config
|
|
7099
7412
|
imagePullPolicy: IfNotPresent
|
|
7100
|
-
image: quay.io/ibmmas/cli:11.
|
|
7413
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7101
7414
|
workspaces:
|
|
7102
7415
|
- name: configs
|
|
7103
7416
|
- name: shared-additional-configs
|
|
@@ -7198,7 +7511,7 @@ spec:
|
|
|
7198
7511
|
- -c
|
|
7199
7512
|
name: gitops-suite-objectstorage-config
|
|
7200
7513
|
imagePullPolicy: IfNotPresent
|
|
7201
|
-
image: quay.io/ibmmas/cli:11.
|
|
7514
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7202
7515
|
workspaces:
|
|
7203
7516
|
- name: configs
|
|
7204
7517
|
- name: shared-gitops-configs
|
|
@@ -7325,15 +7638,7 @@ spec:
|
|
|
7325
7638
|
--config-action upsert \
|
|
7326
7639
|
--mas-config-scope system \
|
|
7327
7640
|
--mas-config-type smtp \
|
|
7328
|
-
--dir /tmp/init-suite-smtp-config
|
|
7329
|
-
--smtp-host "$SMTP_HOST" \
|
|
7330
|
-
--smtp-port "$SMTP_PORT" \
|
|
7331
|
-
--smtp-security "$SMTP_SECURITY" \
|
|
7332
|
-
--smtp-authentication "$SMTP_AUTHENTICATION" \
|
|
7333
|
-
--smtp-default-sender-email "$SMTP_DEFAULT_SENDER_EMAIL" \
|
|
7334
|
-
--smtp-default-sender-name "$SMTP_DEFAULT_SENDER_NAME" \
|
|
7335
|
-
--smtp-default-recipient-email "$SMTP_DEFAULT_RECIPIENT_EMAIL" \
|
|
7336
|
-
--smtp-default-should-email-passwords "$SMTP_DEFAULT_SHOULD_EMAIL_PASSWORDS"
|
|
7641
|
+
--dir /tmp/init-suite-smtp-config
|
|
7337
7642
|
|
|
7338
7643
|
exit $?
|
|
7339
7644
|
|
|
@@ -7342,7 +7647,7 @@ spec:
|
|
|
7342
7647
|
- -c
|
|
7343
7648
|
name: gitops-suite-smtp-config
|
|
7344
7649
|
imagePullPolicy: IfNotPresent
|
|
7345
|
-
image: quay.io/ibmmas/cli:11.
|
|
7650
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7346
7651
|
workspaces:
|
|
7347
7652
|
- name: configs
|
|
7348
7653
|
|
|
@@ -7451,7 +7756,7 @@ spec:
|
|
|
7451
7756
|
- -c
|
|
7452
7757
|
name: gitops-suite-watson-studio-config
|
|
7453
7758
|
imagePullPolicy: IfNotPresent
|
|
7454
|
-
image: quay.io/ibmmas/cli:11.
|
|
7759
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7455
7760
|
workspaces:
|
|
7456
7761
|
- name: configs
|
|
7457
7762
|
- name: shared-gitops-configs
|
|
@@ -7548,7 +7853,7 @@ spec:
|
|
|
7548
7853
|
- -c
|
|
7549
7854
|
name: gitops-suite-workspace
|
|
7550
7855
|
imagePullPolicy: IfNotPresent
|
|
7551
|
-
image: quay.io/ibmmas/cli:11.
|
|
7856
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7552
7857
|
workspaces:
|
|
7553
7858
|
- name: configs
|
|
7554
7859
|
# --------------------------------------------------------------------------------
|
|
@@ -7828,7 +8133,7 @@ spec:
|
|
|
7828
8133
|
- -c
|
|
7829
8134
|
name: gitops-suite
|
|
7830
8135
|
imagePullPolicy: IfNotPresent
|
|
7831
|
-
image: quay.io/ibmmas/cli:11.
|
|
8136
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7832
8137
|
workspaces:
|
|
7833
8138
|
- name: configs
|
|
7834
8139
|
- name: shared-gitops-configs
|
|
@@ -7878,7 +8183,7 @@ spec:
|
|
|
7878
8183
|
|
|
7879
8184
|
steps:
|
|
7880
8185
|
- name: grafana
|
|
7881
|
-
image: quay.io/ibmmas/cli:11.
|
|
8186
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
7882
8187
|
imagePullPolicy: $(params.image_pull_policy)
|
|
7883
8188
|
command:
|
|
7884
8189
|
- /opt/app-root/src/run-role.sh
|
|
@@ -8012,7 +8317,7 @@ spec:
|
|
|
8012
8317
|
command:
|
|
8013
8318
|
- /opt/app-root/src/run-role.sh
|
|
8014
8319
|
- ibm_catalogs
|
|
8015
|
-
image: quay.io/ibmmas/cli:11.
|
|
8320
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8016
8321
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8017
8322
|
workingDir: /workspace/configs
|
|
8018
8323
|
# --------------------------------------------------------------------------------
|
|
@@ -8254,7 +8559,7 @@ spec:
|
|
|
8254
8559
|
command:
|
|
8255
8560
|
- /opt/app-root/src/run-role.sh
|
|
8256
8561
|
- kafka
|
|
8257
|
-
image: quay.io/ibmmas/cli:11.
|
|
8562
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8258
8563
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8259
8564
|
workingDir: /workspace/configs
|
|
8260
8565
|
|
|
@@ -8262,13 +8567,13 @@ spec:
|
|
|
8262
8567
|
- name: configs
|
|
8263
8568
|
optional: true
|
|
8264
8569
|
# --------------------------------------------------------------------------------
|
|
8265
|
-
# /home/runner/work/cli/cli/tekton/target/tasks/
|
|
8570
|
+
# /home/runner/work/cli/cli/tekton/target/tasks/kmodels.yaml
|
|
8266
8571
|
# --------------------------------------------------------------------------------
|
|
8267
8572
|
---
|
|
8268
8573
|
apiVersion: tekton.dev/v1beta1
|
|
8269
8574
|
kind: Task
|
|
8270
8575
|
metadata:
|
|
8271
|
-
name: mas-devops-
|
|
8576
|
+
name: mas-devops-kmodels
|
|
8272
8577
|
spec:
|
|
8273
8578
|
params:
|
|
8274
8579
|
# Common: Control the image pull policy for the CLI container image
|
|
@@ -8283,83 +8588,106 @@ spec:
|
|
|
8283
8588
|
default: ""
|
|
8284
8589
|
|
|
8285
8590
|
|
|
8591
|
+
# Pre-Release Support
|
|
8592
|
+
- name: artifactory_username
|
|
8593
|
+
default: ''
|
|
8594
|
+
type: string
|
|
8595
|
+
description: Required to use development MAS builds
|
|
8596
|
+
- name: artifactory_token
|
|
8597
|
+
default: ''
|
|
8598
|
+
type: string
|
|
8599
|
+
description: Required to use development MAS builds
|
|
8600
|
+
|
|
8601
|
+
# Entitlement
|
|
8602
|
+
- name: ibm_entitlement_key
|
|
8603
|
+
type: string
|
|
8604
|
+
|
|
8605
|
+
# MAS Details
|
|
8286
8606
|
- name: mas_instance_id
|
|
8287
8607
|
type: string
|
|
8288
8608
|
description: Instance ID
|
|
8289
|
-
|
|
8290
|
-
-
|
|
8609
|
+
|
|
8610
|
+
# Application - Operator
|
|
8611
|
+
# - name: mas_aibroker_channel
|
|
8612
|
+
- name: mas_app_channel
|
|
8291
8613
|
type: string
|
|
8292
|
-
description:
|
|
8614
|
+
description: Catalog channel for the application operator subscription
|
|
8615
|
+
|
|
8616
|
+
# Application - Operand
|
|
8617
|
+
- name: mas_app_bindings_jdbc
|
|
8618
|
+
default: ""
|
|
8619
|
+
type: string
|
|
8620
|
+
- name: mas_app_plan
|
|
8621
|
+
type: string
|
|
8622
|
+
description: Application installation plan
|
|
8293
8623
|
default: ""
|
|
8294
8624
|
|
|
8295
|
-
#
|
|
8296
|
-
- name:
|
|
8625
|
+
# Custom Label Support
|
|
8626
|
+
- name: custom_labels
|
|
8297
8627
|
type: string
|
|
8628
|
+
description: Optional MAS custom labels, comma separated list of key=value pairs
|
|
8298
8629
|
default: ""
|
|
8299
8630
|
|
|
8300
|
-
#
|
|
8301
|
-
- name:
|
|
8631
|
+
# Kmodels details
|
|
8632
|
+
- name: mas_aibroker_controller_tag
|
|
8302
8633
|
type: string
|
|
8303
|
-
description: Optional
|
|
8634
|
+
description: Optional Kmodels details
|
|
8304
8635
|
default: ""
|
|
8305
|
-
- name:
|
|
8636
|
+
- name: mas_aibroker_store_tag
|
|
8306
8637
|
type: string
|
|
8307
|
-
description: Optional
|
|
8638
|
+
description: Optional Kmodels details
|
|
8308
8639
|
default: ""
|
|
8309
|
-
- name:
|
|
8640
|
+
- name: mas_aibroker_watcher_tag
|
|
8310
8641
|
type: string
|
|
8311
|
-
description: Optional
|
|
8642
|
+
description: Optional Kmodels details
|
|
8312
8643
|
default: ""
|
|
8313
|
-
- name:
|
|
8644
|
+
- name: mas_aibroker_connector_tag
|
|
8314
8645
|
type: string
|
|
8315
|
-
description:
|
|
8646
|
+
description: Optional Kmodels details
|
|
8316
8647
|
default: ""
|
|
8317
|
-
- name:
|
|
8648
|
+
- name: mas_aibroker_pipeline_steps_tag
|
|
8318
8649
|
type: string
|
|
8319
|
-
description:
|
|
8650
|
+
description: Optional Kmodels details
|
|
8320
8651
|
default: ""
|
|
8321
|
-
- name:
|
|
8652
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
8322
8653
|
type: string
|
|
8323
|
-
description:
|
|
8654
|
+
description: This option is mandatory
|
|
8324
8655
|
default: ""
|
|
8325
|
-
- name:
|
|
8656
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
8326
8657
|
type: string
|
|
8327
|
-
description:
|
|
8658
|
+
description: This option is mandatory
|
|
8328
8659
|
default: ""
|
|
8329
|
-
- name:
|
|
8660
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
8330
8661
|
type: string
|
|
8331
|
-
description:
|
|
8662
|
+
description: This option is mandatory
|
|
8332
8663
|
default: ""
|
|
8333
|
-
- name:
|
|
8664
|
+
- name: mas_aibroker_storage_provider
|
|
8334
8665
|
type: string
|
|
8335
|
-
|
|
8666
|
+
default: "This option is mandatory"
|
|
8336
8667
|
default: ""
|
|
8337
|
-
|
|
8338
|
-
# Dependencies - IBM Cloud MongoDb
|
|
8339
|
-
# -------------------------------------------------------------------------
|
|
8340
|
-
- name: ibmcloud_resourcegroup
|
|
8668
|
+
- name: mas_aibroker_storage_accesskey
|
|
8341
8669
|
type: string
|
|
8342
|
-
|
|
8670
|
+
default: "This option is mandatory"
|
|
8343
8671
|
default: ""
|
|
8344
|
-
- name:
|
|
8672
|
+
- name: mas_aibroker_storage_secretkey
|
|
8345
8673
|
type: string
|
|
8346
|
-
|
|
8674
|
+
default: "This option is mandatory"
|
|
8347
8675
|
default: ""
|
|
8348
|
-
- name:
|
|
8676
|
+
- name: mas_aibroker_storage_host
|
|
8349
8677
|
type: string
|
|
8350
|
-
|
|
8678
|
+
default: "This option is mandatory"
|
|
8351
8679
|
default: ""
|
|
8352
|
-
- name:
|
|
8680
|
+
- name: mas_aibroker_storage_port
|
|
8353
8681
|
type: string
|
|
8354
|
-
|
|
8682
|
+
default: "This option is mandatory"
|
|
8355
8683
|
default: ""
|
|
8356
|
-
- name:
|
|
8684
|
+
- name: mas_aibroker_storage_ssl
|
|
8357
8685
|
type: string
|
|
8358
|
-
|
|
8686
|
+
default: "This option is mandatory"
|
|
8359
8687
|
default: ""
|
|
8360
|
-
- name:
|
|
8688
|
+
- name: mas_aibroker_storage_region
|
|
8361
8689
|
type: string
|
|
8362
|
-
|
|
8690
|
+
default: "This option is mandatory"
|
|
8363
8691
|
default: ""
|
|
8364
8692
|
|
|
8365
8693
|
stepTemplate:
|
|
@@ -8386,13 +8714,201 @@ spec:
|
|
|
8386
8714
|
value: $(params.devops_suite_name)
|
|
8387
8715
|
|
|
8388
8716
|
|
|
8389
|
-
#
|
|
8390
|
-
- name:
|
|
8391
|
-
value:
|
|
8392
|
-
- name:
|
|
8393
|
-
value: $(params.
|
|
8394
|
-
|
|
8395
|
-
|
|
8717
|
+
# Pre-Release Support
|
|
8718
|
+
- name: ARTIFACTORY_USERNAME
|
|
8719
|
+
value: $(params.artifactory_username)
|
|
8720
|
+
- name: ARTIFACTORY_TOKEN
|
|
8721
|
+
value: $(params.artifactory_token)
|
|
8722
|
+
|
|
8723
|
+
# Entitlement
|
|
8724
|
+
- name: IBM_ENTITLEMENT_KEY
|
|
8725
|
+
value: $(params.ibm_entitlement_key)
|
|
8726
|
+
|
|
8727
|
+
# MAS Details
|
|
8728
|
+
- name: MAS_INSTANCE_ID
|
|
8729
|
+
value: $(params.mas_instance_id)
|
|
8730
|
+
|
|
8731
|
+
# Application - Operator
|
|
8732
|
+
# - name: MAS_AIBROKER_CHANNEL
|
|
8733
|
+
# value: $(params.mas_aibroker_channel)
|
|
8734
|
+
- name: MAS_APP_CHANNEL
|
|
8735
|
+
value: $(params.mas_app_channel)
|
|
8736
|
+
|
|
8737
|
+
# Custom Label Support
|
|
8738
|
+
- name: CUSTOM_LABELS
|
|
8739
|
+
value: $(params.custom_labels)
|
|
8740
|
+
|
|
8741
|
+
# Kmodels details
|
|
8742
|
+
- name: MAS_AIBROKER_CONTROLLER_TAG
|
|
8743
|
+
value: $(params.mas_aibroker_controller_tag)
|
|
8744
|
+
- name: MAS_AIBROKER_STORE_TAG
|
|
8745
|
+
value: $(params.mas_aibroker_store_tag)
|
|
8746
|
+
- name: MAS_AIBROKER_WATCHER_TAG
|
|
8747
|
+
value: $(params.mas_aibroker_watcher_tag)
|
|
8748
|
+
- name: MAS_AIBROKER_CONNECTOR_TAG
|
|
8749
|
+
value: $(params.mas_aibroker_connector_tag)
|
|
8750
|
+
- name: MAS_AIBROKER_PIPELINE_STEPS_TAG
|
|
8751
|
+
value: $(params.mas_aibroker_pipeline_steps_tag)
|
|
8752
|
+
- name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
|
|
8753
|
+
value: $(params.mas_aibroker_storage_pipelines_bucket)
|
|
8754
|
+
- name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
|
|
8755
|
+
value: $(params.mas_aibroker_storage_tenants_bucket)
|
|
8756
|
+
- name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
|
|
8757
|
+
value: $(params.mas_aibroker_storage_templates_bucket)
|
|
8758
|
+
- name: MAS_AIBROKER_STORAGE_PROVIDER
|
|
8759
|
+
value: $(params.mas_aibroker_storage_provider)
|
|
8760
|
+
- name: MAS_AIBROKER_STORAGE_ACCESSKEY
|
|
8761
|
+
value: $(params.mas_aibroker_storage_accesskey)
|
|
8762
|
+
- name: MAS_AIBROKER_STORAGE_SECRETKEY
|
|
8763
|
+
value: $(params.mas_aibroker_storage_secretkey)
|
|
8764
|
+
- name: MAS_AIBROKER_STORAGE_HOST
|
|
8765
|
+
value: $(params.mas_aibroker_storage_host)
|
|
8766
|
+
- name: MAS_AIBROKER_STORAGE_PORT
|
|
8767
|
+
value: $(params.mas_aibroker_storage_port)
|
|
8768
|
+
- name: MAS_AIBROKER_STORAGE_SSL
|
|
8769
|
+
value: $(params.mas_aibroker_storage_ssl)
|
|
8770
|
+
- name: MAS_AIBROKER_STORAGE_REGION
|
|
8771
|
+
value: $(params.mas_aibroker_storage_region)
|
|
8772
|
+
|
|
8773
|
+
steps:
|
|
8774
|
+
- name: kmodels
|
|
8775
|
+
command:
|
|
8776
|
+
- /opt/app-root/src/run-role.sh
|
|
8777
|
+
- kmodels
|
|
8778
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8779
|
+
imagePullPolicy: $(params.image_pull_policy)
|
|
8780
|
+
# --------------------------------------------------------------------------------
|
|
8781
|
+
# /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
|
|
8782
|
+
# --------------------------------------------------------------------------------
|
|
8783
|
+
---
|
|
8784
|
+
apiVersion: tekton.dev/v1beta1
|
|
8785
|
+
kind: Task
|
|
8786
|
+
metadata:
|
|
8787
|
+
name: mas-devops-mongodb
|
|
8788
|
+
spec:
|
|
8789
|
+
params:
|
|
8790
|
+
# Common: Control the image pull policy for the CLI container image
|
|
8791
|
+
- name: image_pull_policy
|
|
8792
|
+
type: string
|
|
8793
|
+
default: IfNotPresent
|
|
8794
|
+
|
|
8795
|
+
# Common: Support for saving task execution results to a MongoDb instance
|
|
8796
|
+
- name: devops_suite_name
|
|
8797
|
+
type: string
|
|
8798
|
+
description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
|
|
8799
|
+
default: ""
|
|
8800
|
+
|
|
8801
|
+
|
|
8802
|
+
- name: mas_instance_id
|
|
8803
|
+
type: string
|
|
8804
|
+
description: Instance ID
|
|
8805
|
+
default: "" # By default, no config will be generated
|
|
8806
|
+
- name: custom_labels
|
|
8807
|
+
type: string
|
|
8808
|
+
description: Optional MAS custom labels, comma separated list of key=value pairs
|
|
8809
|
+
default: ""
|
|
8810
|
+
|
|
8811
|
+
# Storage Class
|
|
8812
|
+
- name: mongodb_storage_class
|
|
8813
|
+
type: string
|
|
8814
|
+
default: ""
|
|
8815
|
+
|
|
8816
|
+
# Other mongoDb parameters
|
|
8817
|
+
- name: mongodb_namespace
|
|
8818
|
+
type: string
|
|
8819
|
+
description: Optional configuration for mongodb namespace
|
|
8820
|
+
default: ""
|
|
8821
|
+
- name: mongodb_replicas
|
|
8822
|
+
type: string
|
|
8823
|
+
description: Optional configuration for mongodb replicas
|
|
8824
|
+
default: ""
|
|
8825
|
+
- name: mongodb_cpu_requests
|
|
8826
|
+
type: string
|
|
8827
|
+
description: Optional configuration for mongodb cpu requests
|
|
8828
|
+
default: ""
|
|
8829
|
+
- name: mongodb_provider
|
|
8830
|
+
type: string
|
|
8831
|
+
description: MongoDb provider
|
|
8832
|
+
default: ""
|
|
8833
|
+
- name: mongodb_version
|
|
8834
|
+
type: string
|
|
8835
|
+
description: MongoDb version
|
|
8836
|
+
default: ""
|
|
8837
|
+
- name: mongodb_action
|
|
8838
|
+
type: string
|
|
8839
|
+
description: Optional. Used to uninstall MongoDB
|
|
8840
|
+
default: ""
|
|
8841
|
+
- name: mongodb_v5_upgrade
|
|
8842
|
+
type: string
|
|
8843
|
+
description: Approves the MongoDb upgrade to version 5 if needed
|
|
8844
|
+
default: ""
|
|
8845
|
+
- name: mongodb_v6_upgrade
|
|
8846
|
+
type: string
|
|
8847
|
+
description: Approves the MongoDb upgrade to version 6 if needed
|
|
8848
|
+
default: ""
|
|
8849
|
+
- name: mongodb_v7_upgrade
|
|
8850
|
+
type: string
|
|
8851
|
+
description: Approves the MongoDb upgrade to version 7 if needed
|
|
8852
|
+
default: ""
|
|
8853
|
+
|
|
8854
|
+
# Dependencies - IBM Cloud MongoDb
|
|
8855
|
+
# -------------------------------------------------------------------------
|
|
8856
|
+
- name: ibmcloud_resourcegroup
|
|
8857
|
+
type: string
|
|
8858
|
+
description: IBM Cloud resource group
|
|
8859
|
+
default: ""
|
|
8860
|
+
- name: ibm_mongo_name
|
|
8861
|
+
type: string
|
|
8862
|
+
description: IBM Cloud MongoDb instance name
|
|
8863
|
+
default: ""
|
|
8864
|
+
- name: ibm_mongo_admin_password
|
|
8865
|
+
type: string
|
|
8866
|
+
description: IBM Cloud MongoDb admin password
|
|
8867
|
+
default: ""
|
|
8868
|
+
- name: ibm_mongo_resourcegroup
|
|
8869
|
+
type: string
|
|
8870
|
+
description: IBM Cloud MongoDb resource group
|
|
8871
|
+
default: ""
|
|
8872
|
+
- name: ibm_mongo_region
|
|
8873
|
+
type: string
|
|
8874
|
+
description: IBM Cloud MongoDb instance region
|
|
8875
|
+
default: ""
|
|
8876
|
+
- name: ibmcloud_apikey
|
|
8877
|
+
type: string
|
|
8878
|
+
description: API Key used to create Mongo instance in IBM Cloud
|
|
8879
|
+
default: ""
|
|
8880
|
+
|
|
8881
|
+
stepTemplate:
|
|
8882
|
+
env:
|
|
8883
|
+
- name: DEVOPS_MONGO_URI
|
|
8884
|
+
valueFrom:
|
|
8885
|
+
secretKeyRef:
|
|
8886
|
+
name: mas-devops
|
|
8887
|
+
key: DEVOPS_MONGO_URI
|
|
8888
|
+
optional: true
|
|
8889
|
+
- name: DEVOPS_BUILD_NUMBER
|
|
8890
|
+
valueFrom:
|
|
8891
|
+
secretKeyRef:
|
|
8892
|
+
name: mas-devops
|
|
8893
|
+
key: DEVOPS_BUILD_NUMBER
|
|
8894
|
+
optional: true
|
|
8895
|
+
- name: DEVOPS_ENVIRONMENT
|
|
8896
|
+
valueFrom:
|
|
8897
|
+
secretKeyRef:
|
|
8898
|
+
name: mas-devops
|
|
8899
|
+
key: MAS_INSTANCE_ID
|
|
8900
|
+
optional: true
|
|
8901
|
+
- name: DEVOPS_SUITE_NAME
|
|
8902
|
+
value: $(params.devops_suite_name)
|
|
8903
|
+
|
|
8904
|
+
|
|
8905
|
+
# General
|
|
8906
|
+
- name: MAS_CONFIG_DIR
|
|
8907
|
+
value: /workspace/configs
|
|
8908
|
+
- name: MAS_INSTANCE_ID
|
|
8909
|
+
value: $(params.mas_instance_id)
|
|
8910
|
+
- name: CUSTOM_LABELS
|
|
8911
|
+
value: $(params.custom_labels)
|
|
8396
8912
|
|
|
8397
8913
|
# Storage Classs
|
|
8398
8914
|
- name: MONGODB_STORAGE_CLASS
|
|
@@ -8437,7 +8953,7 @@ spec:
|
|
|
8437
8953
|
command:
|
|
8438
8954
|
- /opt/app-root/src/run-role.sh
|
|
8439
8955
|
- mongodb
|
|
8440
|
-
image: quay.io/ibmmas/cli:11.
|
|
8956
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8441
8957
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8442
8958
|
workingDir: /workspace/configs
|
|
8443
8959
|
|
|
@@ -8480,7 +8996,7 @@ spec:
|
|
|
8480
8996
|
- $(params.base_output_dir)
|
|
8481
8997
|
- --extra-namespaces
|
|
8482
8998
|
- selenium
|
|
8483
|
-
image: quay.io/ibmmas/cli:11.
|
|
8999
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8484
9000
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8485
9001
|
env:
|
|
8486
9002
|
- name: DEVOPS_MONGO_URI
|
|
@@ -8597,7 +9113,7 @@ spec:
|
|
|
8597
9113
|
command:
|
|
8598
9114
|
- /opt/app-root/src/run-role.sh
|
|
8599
9115
|
- nvidia_gpu
|
|
8600
|
-
image: quay.io/ibmmas/cli:11.
|
|
9116
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8601
9117
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8602
9118
|
workingDir: /workspace/configs
|
|
8603
9119
|
|
|
@@ -8633,7 +9149,7 @@ spec:
|
|
|
8633
9149
|
# Verify Cluster
|
|
8634
9150
|
# -------------------------------------------------------------------------
|
|
8635
9151
|
- name: ocp-verify-cluster
|
|
8636
|
-
image: quay.io/ibmmas/cli:11.
|
|
9152
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8637
9153
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8638
9154
|
command:
|
|
8639
9155
|
- /opt/app-root/src/run-role.sh
|
|
@@ -8675,7 +9191,7 @@ spec:
|
|
|
8675
9191
|
# Verify Catalogs
|
|
8676
9192
|
# -------------------------------------------------------------------------
|
|
8677
9193
|
- name: ocp-verify-catalogs
|
|
8678
|
-
image: quay.io/ibmmas/cli:11.
|
|
9194
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8679
9195
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8680
9196
|
command:
|
|
8681
9197
|
- /opt/app-root/src/run-role.sh
|
|
@@ -8717,7 +9233,7 @@ spec:
|
|
|
8717
9233
|
# Verify Subscriptions
|
|
8718
9234
|
# -------------------------------------------------------------------------
|
|
8719
9235
|
- name: ocp-verify-subscriptions
|
|
8720
|
-
image: quay.io/ibmmas/cli:11.
|
|
9236
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8721
9237
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8722
9238
|
command:
|
|
8723
9239
|
- /opt/app-root/src/run-role.sh
|
|
@@ -8759,7 +9275,7 @@ spec:
|
|
|
8759
9275
|
# Verify Workloads
|
|
8760
9276
|
# -------------------------------------------------------------------------
|
|
8761
9277
|
- name: ocp-verify-workloads
|
|
8762
|
-
image: quay.io/ibmmas/cli:11.
|
|
9278
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8763
9279
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8764
9280
|
command:
|
|
8765
9281
|
- /opt/app-root/src/run-role.sh
|
|
@@ -8801,7 +9317,7 @@ spec:
|
|
|
8801
9317
|
# Verify Catalogs - Ingress TLS
|
|
8802
9318
|
# -------------------------------------------------------------------------
|
|
8803
9319
|
- name: ocp-verify-ingress
|
|
8804
|
-
image: quay.io/ibmmas/cli:11.
|
|
9320
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8805
9321
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8806
9322
|
command:
|
|
8807
9323
|
- /opt/app-root/src/run-role.sh
|
|
@@ -8927,7 +9443,7 @@ spec:
|
|
|
8927
9443
|
command:
|
|
8928
9444
|
- /opt/app-root/src/run-role.sh
|
|
8929
9445
|
- ocp_verify
|
|
8930
|
-
image: quay.io/ibmmas/cli:11.
|
|
9446
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8931
9447
|
imagePullPolicy: $(params.image_pull_policy)
|
|
8932
9448
|
workingDir: /workspace/configs
|
|
8933
9449
|
# --------------------------------------------------------------------------------
|
|
@@ -8995,7 +9511,7 @@ spec:
|
|
|
8995
9511
|
command:
|
|
8996
9512
|
- /opt/app-root/src/run-role.sh
|
|
8997
9513
|
- ocs
|
|
8998
|
-
image: quay.io/ibmmas/cli:11.
|
|
9514
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
8999
9515
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9000
9516
|
workingDir: /workspace/configs
|
|
9001
9517
|
|
|
@@ -9003,47 +9519,13 @@ spec:
|
|
|
9003
9519
|
- name: configs
|
|
9004
9520
|
optional: true
|
|
9005
9521
|
# --------------------------------------------------------------------------------
|
|
9006
|
-
# /home/runner/work/cli/cli/tekton/target/tasks/
|
|
9007
|
-
# --------------------------------------------------------------------------------
|
|
9008
|
-
---
|
|
9009
|
-
apiVersion: tekton.dev/v1beta1
|
|
9010
|
-
kind: Task
|
|
9011
|
-
metadata:
|
|
9012
|
-
name: sls-registry-update
|
|
9013
|
-
spec:
|
|
9014
|
-
steps:
|
|
9015
|
-
- name: update-licenseservice
|
|
9016
|
-
image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
|
|
9017
|
-
script: |
|
|
9018
|
-
#!/usr/bin/env bash
|
|
9019
|
-
|
|
9020
|
-
echo "Updating registry to 'icr.io/cpopen' for all LicenseService CR instances..."
|
|
9021
|
-
|
|
9022
|
-
echo ""
|
|
9023
|
-
echo "Get all LicenseService CR instances..."
|
|
9024
|
-
echo "------------------------------------------------------------------"
|
|
9025
|
-
|
|
9026
|
-
LICENSE_SERVICE_INSTANCES=`oc get LicenseService --all-namespaces`
|
|
9027
|
-
INSTANCES_COUNT=$(wc -l <<< "${LICENSE_SERVICE_INSTANCES}" | sed 's/ //g')
|
|
9028
|
-
|
|
9029
|
-
echo ""
|
|
9030
|
-
echo "Patching all LicenseService CR instances..."
|
|
9031
|
-
echo "------------------------------------------------------------------"
|
|
9032
|
-
|
|
9033
|
-
for (( l=2; l<=${INSTANCES_COUNT}; l++ ))
|
|
9034
|
-
do
|
|
9035
|
-
SLS_NAMESPACE=$(echo "$LICENSE_SERVICE_INSTANCES" | awk -v "line=$l" 'NR==line {print $1}')
|
|
9036
|
-
SLS_INSTANCE_ID=$(echo "$LICENSE_SERVICE_INSTANCES" | awk -v "line=$l" 'NR==line {print $2}')
|
|
9037
|
-
oc patch --type=merge LicenseService/${SLS_INSTANCE_ID} -p '{"spec": {"settings": {"registry": "icr.io/cpopen"}}}' -n ${SLS_NAMESPACE}
|
|
9038
|
-
done
|
|
9039
|
-
# --------------------------------------------------------------------------------
|
|
9040
|
-
# /home/runner/work/cli/cli/tekton/target/tasks/sls.yaml
|
|
9522
|
+
# /home/runner/work/cli/cli/tekton/target/tasks/odh.yaml
|
|
9041
9523
|
# --------------------------------------------------------------------------------
|
|
9042
9524
|
---
|
|
9043
9525
|
apiVersion: tekton.dev/v1beta1
|
|
9044
9526
|
kind: Task
|
|
9045
9527
|
metadata:
|
|
9046
|
-
name: mas-devops-
|
|
9528
|
+
name: mas-devops-odh
|
|
9047
9529
|
spec:
|
|
9048
9530
|
params:
|
|
9049
9531
|
# Common: Control the image pull policy for the CLI container image
|
|
@@ -9058,67 +9540,332 @@ spec:
|
|
|
9058
9540
|
default: ""
|
|
9059
9541
|
|
|
9060
9542
|
|
|
9543
|
+
# Pre-Release Support
|
|
9544
|
+
- name: artifactory_username
|
|
9545
|
+
default: ''
|
|
9546
|
+
type: string
|
|
9547
|
+
description: Required to use development MAS builds
|
|
9548
|
+
- name: artifactory_token
|
|
9549
|
+
default: ''
|
|
9550
|
+
type: string
|
|
9551
|
+
description: Required to use development MAS builds
|
|
9552
|
+
|
|
9553
|
+
# Entitlement
|
|
9554
|
+
- name: ibm_entitlement_key
|
|
9555
|
+
type: string
|
|
9556
|
+
|
|
9557
|
+
# MAS Details
|
|
9061
9558
|
- name: mas_instance_id
|
|
9062
9559
|
type: string
|
|
9063
9560
|
description: Instance ID
|
|
9064
|
-
|
|
9561
|
+
|
|
9562
|
+
# Application - Operator
|
|
9563
|
+
# - name: mas_aibroker_channel
|
|
9564
|
+
- name: mas_app_channel
|
|
9565
|
+
type: string
|
|
9566
|
+
description: Catalog channel for the application operator subscription
|
|
9567
|
+
|
|
9568
|
+
# Application - Operand
|
|
9569
|
+
- name: mas_app_bindings_jdbc
|
|
9570
|
+
default: ""
|
|
9571
|
+
type: string
|
|
9572
|
+
- name: mas_app_plan
|
|
9573
|
+
type: string
|
|
9574
|
+
description: Application installation plan
|
|
9575
|
+
default: ""
|
|
9576
|
+
|
|
9577
|
+
# Custom Label Support
|
|
9065
9578
|
- name: custom_labels
|
|
9066
9579
|
type: string
|
|
9067
9580
|
description: Optional MAS custom labels, comma separated list of key=value pairs
|
|
9068
9581
|
default: ""
|
|
9069
9582
|
|
|
9070
|
-
|
|
9583
|
+
# Opendatahub details
|
|
9584
|
+
- name: mas_aibroker_storage_provider
|
|
9071
9585
|
type: string
|
|
9586
|
+
default: "This option is mandatory"
|
|
9072
9587
|
default: ""
|
|
9073
|
-
- name:
|
|
9588
|
+
- name: mas_aibroker_storage_accesskey
|
|
9074
9589
|
type: string
|
|
9590
|
+
default: "This option is mandatory"
|
|
9075
9591
|
default: ""
|
|
9076
|
-
- name:
|
|
9592
|
+
- name: mas_aibroker_storage_secretkey
|
|
9077
9593
|
type: string
|
|
9594
|
+
default: "This option is mandatory"
|
|
9078
9595
|
default: ""
|
|
9079
|
-
- name:
|
|
9596
|
+
- name: mas_aibroker_storage_host
|
|
9080
9597
|
type: string
|
|
9598
|
+
default: "This option is mandatory"
|
|
9081
9599
|
default: ""
|
|
9082
|
-
- name:
|
|
9600
|
+
- name: mas_aibroker_storage_port
|
|
9083
9601
|
type: string
|
|
9602
|
+
default: "This option is mandatory"
|
|
9084
9603
|
default: ""
|
|
9085
|
-
|
|
9086
|
-
# New way of bootstrapping license file since SLS 3.7.0
|
|
9087
|
-
- name: sls_entitlement_file
|
|
9604
|
+
- name: mas_aibroker_storage_ssl
|
|
9088
9605
|
type: string
|
|
9606
|
+
default: "This option is mandatory"
|
|
9089
9607
|
default: ""
|
|
9090
|
-
|
|
9091
|
-
# Entitlement (only used for artifactory auth since 3.8.0)
|
|
9092
|
-
- name: ibm_entitlement_key
|
|
9608
|
+
- name: mas_aibroker_storage_region
|
|
9093
9609
|
type: string
|
|
9610
|
+
default: "This option is mandatory"
|
|
9094
9611
|
default: ""
|
|
9095
|
-
|
|
9096
|
-
|
|
9612
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
9613
|
+
type: string
|
|
9614
|
+
default: "This option is mandatory"
|
|
9097
9615
|
default: ""
|
|
9616
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
9098
9617
|
type: string
|
|
9099
|
-
|
|
9100
|
-
- name: artifactory_token
|
|
9618
|
+
default: "This option is mandatory"
|
|
9101
9619
|
default: ""
|
|
9620
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
9102
9621
|
type: string
|
|
9103
|
-
|
|
9104
|
-
|
|
9105
|
-
|
|
9106
|
-
- name: sls_action
|
|
9622
|
+
default: "This option is mandatory"
|
|
9623
|
+
default: ""
|
|
9624
|
+
- name: mas_aibroker_tenant_name
|
|
9107
9625
|
type: string
|
|
9108
|
-
|
|
9626
|
+
default: "This option is mandatory"
|
|
9109
9627
|
default: ""
|
|
9110
|
-
|
|
9111
|
-
|
|
9112
|
-
|
|
9113
|
-
|
|
9114
|
-
|
|
9115
|
-
|
|
9116
|
-
|
|
9117
|
-
|
|
9118
|
-
|
|
9119
|
-
|
|
9120
|
-
|
|
9121
|
-
|
|
9628
|
+
- name: mas_aibroker_db_host
|
|
9629
|
+
type: string
|
|
9630
|
+
default: "This option is mandatory"
|
|
9631
|
+
default: ""
|
|
9632
|
+
- name: mas_aibroker_db_port
|
|
9633
|
+
type: string
|
|
9634
|
+
default: "This option is mandatory"
|
|
9635
|
+
default: ""
|
|
9636
|
+
- name: mas_aibroker_db_user
|
|
9637
|
+
type: string
|
|
9638
|
+
default: "This option is mandatory"
|
|
9639
|
+
default: ""
|
|
9640
|
+
- name: mas_aibroker_db_database
|
|
9641
|
+
type: string
|
|
9642
|
+
default: "This option is mandatory"
|
|
9643
|
+
default: ""
|
|
9644
|
+
- name: mas_aibroker_db_secret_name
|
|
9645
|
+
type: string
|
|
9646
|
+
default: "This option is mandatory"
|
|
9647
|
+
default: ""
|
|
9648
|
+
- name: mas_aibroker_db_secret_key
|
|
9649
|
+
type: string
|
|
9650
|
+
default: "This option is mandatory"
|
|
9651
|
+
default: ""
|
|
9652
|
+
- name: mas_aibroker_db_secret_value
|
|
9653
|
+
type: string
|
|
9654
|
+
default: "This option is mandatory"
|
|
9655
|
+
default: ""
|
|
9656
|
+
|
|
9657
|
+
stepTemplate:
|
|
9658
|
+
env:
|
|
9659
|
+
- name: DEVOPS_MONGO_URI
|
|
9660
|
+
valueFrom:
|
|
9661
|
+
secretKeyRef:
|
|
9662
|
+
name: mas-devops
|
|
9663
|
+
key: DEVOPS_MONGO_URI
|
|
9664
|
+
optional: true
|
|
9665
|
+
- name: DEVOPS_BUILD_NUMBER
|
|
9666
|
+
valueFrom:
|
|
9667
|
+
secretKeyRef:
|
|
9668
|
+
name: mas-devops
|
|
9669
|
+
key: DEVOPS_BUILD_NUMBER
|
|
9670
|
+
optional: true
|
|
9671
|
+
- name: DEVOPS_ENVIRONMENT
|
|
9672
|
+
valueFrom:
|
|
9673
|
+
secretKeyRef:
|
|
9674
|
+
name: mas-devops
|
|
9675
|
+
key: MAS_INSTANCE_ID
|
|
9676
|
+
optional: true
|
|
9677
|
+
- name: DEVOPS_SUITE_NAME
|
|
9678
|
+
value: $(params.devops_suite_name)
|
|
9679
|
+
|
|
9680
|
+
|
|
9681
|
+
# Pre-Release Support
|
|
9682
|
+
- name: ARTIFACTORY_USERNAME
|
|
9683
|
+
value: $(params.artifactory_username)
|
|
9684
|
+
- name: ARTIFACTORY_TOKEN
|
|
9685
|
+
value: $(params.artifactory_token)
|
|
9686
|
+
|
|
9687
|
+
# Entitlement
|
|
9688
|
+
- name: IBM_ENTITLEMENT_KEY
|
|
9689
|
+
value: $(params.ibm_entitlement_key)
|
|
9690
|
+
|
|
9691
|
+
# MAS Details
|
|
9692
|
+
- name: MAS_INSTANCE_ID
|
|
9693
|
+
value: $(params.mas_instance_id)
|
|
9694
|
+
|
|
9695
|
+
# Application - Operator
|
|
9696
|
+
# - name: MAS_AIBROKER_CHANNEL
|
|
9697
|
+
# value: $(params.mas_aibroker_channel)
|
|
9698
|
+
- name: MAS_APP_CHANNEL
|
|
9699
|
+
value: $(params.mas_app_channel)
|
|
9700
|
+
|
|
9701
|
+
# Custom Label Support
|
|
9702
|
+
- name: CUSTOM_LABELS
|
|
9703
|
+
value: $(params.custom_labels)
|
|
9704
|
+
|
|
9705
|
+
# Opendatahub storage details
|
|
9706
|
+
- name: MAS_AIBROKER_STORAGE_PROVIDER
|
|
9707
|
+
value: $(params.mas_aibroker_storage_provider)
|
|
9708
|
+
- name: MAS_AIBROKER_STORAGE_ACCESSKEY
|
|
9709
|
+
value: $(params.mas_aibroker_storage_accesskey)
|
|
9710
|
+
- name: MAS_AIBROKER_STORAGE_SECRETKEY
|
|
9711
|
+
value: $(params.mas_aibroker_storage_secretkey)
|
|
9712
|
+
- name: MAS_AIBROKER_STORAGE_HOST
|
|
9713
|
+
value: $(params.mas_aibroker_storage_host)
|
|
9714
|
+
- name: MAS_AIBROKER_STORAGE_PORT
|
|
9715
|
+
value: $(params.mas_aibroker_storage_port)
|
|
9716
|
+
- name: MAS_AIBROKER_STORAGE_SSL
|
|
9717
|
+
value: $(params.mas_aibroker_storage_ssl)
|
|
9718
|
+
- name: MAS_AIBROKER_STORAGE_REGION
|
|
9719
|
+
value: $(params.mas_aibroker_storage_region)
|
|
9720
|
+
- name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
|
|
9721
|
+
value: $(params.mas_aibroker_storage_pipelines_bucket)
|
|
9722
|
+
- name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
|
|
9723
|
+
value: $(params.mas_aibroker_storage_tenants_bucket)
|
|
9724
|
+
- name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
|
|
9725
|
+
value: $(params.mas_aibroker_storage_templates_bucket)
|
|
9726
|
+
- name: MAS_AIBROKER_TENANT_NAME
|
|
9727
|
+
value: $(params.mas_aibroker_tenant_name)
|
|
9728
|
+
|
|
9729
|
+
# MariaDB details
|
|
9730
|
+
- name: MAS_AIBROKER_DB_HOST
|
|
9731
|
+
value: $(params.mas_aibroker_db_host)
|
|
9732
|
+
- name: MAS_AIBROKER_DB_PORT
|
|
9733
|
+
value: $(params.mas_aibroker_db_port)
|
|
9734
|
+
- name: MAS_AIBROKER_DB_USER
|
|
9735
|
+
value: $(params.mas_aibroker_db_user)
|
|
9736
|
+
- name: MAS_AIBROKER_DB_DATABASE
|
|
9737
|
+
value: $(params.mas_aibroker_db_database)
|
|
9738
|
+
- name: MAS_AIBROKER_DB_SECRET_NAME
|
|
9739
|
+
value: $(params.mas_aibroker_db_secret_name)
|
|
9740
|
+
- name: MAS_AIBROKER_DB_SECRET_KEY
|
|
9741
|
+
value: $(params.mas_aibroker_db_secret_key)
|
|
9742
|
+
- name: MAS_AIBROKER_DB_SECRET_VALUE
|
|
9743
|
+
value: $(params.mas_aibroker_db_secret_value)
|
|
9744
|
+
|
|
9745
|
+
steps:
|
|
9746
|
+
- name: odh
|
|
9747
|
+
command:
|
|
9748
|
+
- /opt/app-root/src/run-role.sh
|
|
9749
|
+
- odh
|
|
9750
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9751
|
+
imagePullPolicy: $(params.image_pull_policy)
|
|
9752
|
+
# --------------------------------------------------------------------------------
|
|
9753
|
+
# /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
|
|
9754
|
+
# --------------------------------------------------------------------------------
|
|
9755
|
+
---
|
|
9756
|
+
apiVersion: tekton.dev/v1beta1
|
|
9757
|
+
kind: Task
|
|
9758
|
+
metadata:
|
|
9759
|
+
name: sls-registry-update
|
|
9760
|
+
spec:
|
|
9761
|
+
steps:
|
|
9762
|
+
- name: update-licenseservice
|
|
9763
|
+
image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
|
|
9764
|
+
script: |
|
|
9765
|
+
#!/usr/bin/env bash
|
|
9766
|
+
|
|
9767
|
+
echo "Updating registry to 'icr.io/cpopen' for all LicenseService CR instances..."
|
|
9768
|
+
|
|
9769
|
+
echo ""
|
|
9770
|
+
echo "Get all LicenseService CR instances..."
|
|
9771
|
+
echo "------------------------------------------------------------------"
|
|
9772
|
+
|
|
9773
|
+
LICENSE_SERVICE_INSTANCES=`oc get LicenseService --all-namespaces`
|
|
9774
|
+
INSTANCES_COUNT=$(wc -l <<< "${LICENSE_SERVICE_INSTANCES}" | sed 's/ //g')
|
|
9775
|
+
|
|
9776
|
+
echo ""
|
|
9777
|
+
echo "Patching all LicenseService CR instances..."
|
|
9778
|
+
echo "------------------------------------------------------------------"
|
|
9779
|
+
|
|
9780
|
+
for (( l=2; l<=${INSTANCES_COUNT}; l++ ))
|
|
9781
|
+
do
|
|
9782
|
+
SLS_NAMESPACE=$(echo "$LICENSE_SERVICE_INSTANCES" | awk -v "line=$l" 'NR==line {print $1}')
|
|
9783
|
+
SLS_INSTANCE_ID=$(echo "$LICENSE_SERVICE_INSTANCES" | awk -v "line=$l" 'NR==line {print $2}')
|
|
9784
|
+
oc patch --type=merge LicenseService/${SLS_INSTANCE_ID} -p '{"spec": {"settings": {"registry": "icr.io/cpopen"}}}' -n ${SLS_NAMESPACE}
|
|
9785
|
+
done
|
|
9786
|
+
# --------------------------------------------------------------------------------
|
|
9787
|
+
# /home/runner/work/cli/cli/tekton/target/tasks/sls.yaml
|
|
9788
|
+
# --------------------------------------------------------------------------------
|
|
9789
|
+
---
|
|
9790
|
+
apiVersion: tekton.dev/v1beta1
|
|
9791
|
+
kind: Task
|
|
9792
|
+
metadata:
|
|
9793
|
+
name: mas-devops-sls
|
|
9794
|
+
spec:
|
|
9795
|
+
params:
|
|
9796
|
+
# Common: Control the image pull policy for the CLI container image
|
|
9797
|
+
- name: image_pull_policy
|
|
9798
|
+
type: string
|
|
9799
|
+
default: IfNotPresent
|
|
9800
|
+
|
|
9801
|
+
# Common: Support for saving task execution results to a MongoDb instance
|
|
9802
|
+
- name: devops_suite_name
|
|
9803
|
+
type: string
|
|
9804
|
+
description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
|
|
9805
|
+
default: ""
|
|
9806
|
+
|
|
9807
|
+
|
|
9808
|
+
- name: mas_instance_id
|
|
9809
|
+
type: string
|
|
9810
|
+
description: Instance ID
|
|
9811
|
+
default: "" # By default, no config will be generated
|
|
9812
|
+
- name: custom_labels
|
|
9813
|
+
type: string
|
|
9814
|
+
description: Optional MAS custom labels, comma separated list of key=value pairs
|
|
9815
|
+
default: ""
|
|
9816
|
+
|
|
9817
|
+
- name: sls_namespace
|
|
9818
|
+
type: string
|
|
9819
|
+
default: ""
|
|
9820
|
+
- name: sls_mongodb_cfg_file
|
|
9821
|
+
type: string
|
|
9822
|
+
default: ""
|
|
9823
|
+
- name: sls_catalog_source
|
|
9824
|
+
type: string
|
|
9825
|
+
default: ""
|
|
9826
|
+
- name: sls_channel
|
|
9827
|
+
type: string
|
|
9828
|
+
default: ""
|
|
9829
|
+
- name: sls_icr_cpopen
|
|
9830
|
+
type: string
|
|
9831
|
+
default: ""
|
|
9832
|
+
|
|
9833
|
+
# New way of bootstrapping license file since SLS 3.7.0
|
|
9834
|
+
- name: sls_entitlement_file
|
|
9835
|
+
type: string
|
|
9836
|
+
default: ""
|
|
9837
|
+
|
|
9838
|
+
# Entitlement (only used for artifactory auth since 3.8.0)
|
|
9839
|
+
- name: ibm_entitlement_key
|
|
9840
|
+
type: string
|
|
9841
|
+
default: ""
|
|
9842
|
+
|
|
9843
|
+
- name: artifactory_username
|
|
9844
|
+
default: ""
|
|
9845
|
+
type: string
|
|
9846
|
+
description: Required to use development MAS builds
|
|
9847
|
+
- name: artifactory_token
|
|
9848
|
+
default: ""
|
|
9849
|
+
type: string
|
|
9850
|
+
description: Required to use development MAS builds
|
|
9851
|
+
|
|
9852
|
+
# Optional parameter to uninstall SLS
|
|
9853
|
+
- name: sls_action
|
|
9854
|
+
type: string
|
|
9855
|
+
description: Optional. Used to uninstall SLS
|
|
9856
|
+
default: ""
|
|
9857
|
+
|
|
9858
|
+
stepTemplate:
|
|
9859
|
+
env:
|
|
9860
|
+
- name: DEVOPS_MONGO_URI
|
|
9861
|
+
valueFrom:
|
|
9862
|
+
secretKeyRef:
|
|
9863
|
+
name: mas-devops
|
|
9864
|
+
key: DEVOPS_MONGO_URI
|
|
9865
|
+
optional: true
|
|
9866
|
+
- name: DEVOPS_BUILD_NUMBER
|
|
9867
|
+
valueFrom:
|
|
9868
|
+
secretKeyRef:
|
|
9122
9869
|
name: mas-devops
|
|
9123
9870
|
key: DEVOPS_BUILD_NUMBER
|
|
9124
9871
|
optional: true
|
|
@@ -9176,7 +9923,7 @@ spec:
|
|
|
9176
9923
|
command:
|
|
9177
9924
|
- /opt/app-root/src/run-role.sh
|
|
9178
9925
|
- sls
|
|
9179
|
-
image: quay.io/ibmmas/cli:11.
|
|
9926
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9180
9927
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9181
9928
|
workingDir: /workspace/configs
|
|
9182
9929
|
|
|
@@ -9551,12 +10298,12 @@ spec:
|
|
|
9551
10298
|
command:
|
|
9552
10299
|
- /opt/app-root/src/run-role.sh
|
|
9553
10300
|
- suite_app_config
|
|
9554
|
-
image: quay.io/ibmmas/cli:11.
|
|
10301
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9555
10302
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9556
10303
|
|
|
9557
10304
|
# If configmap/approval-app-cfg-$(params.mas_app_id) exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
|
|
9558
10305
|
- name: app-cfg-post-verify
|
|
9559
|
-
image: quay.io/ibmmas/cli:11.
|
|
10306
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9560
10307
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9561
10308
|
command:
|
|
9562
10309
|
- /opt/app-root/src/wait-for-configmap.sh
|
|
@@ -9757,7 +10504,7 @@ spec:
|
|
|
9757
10504
|
command:
|
|
9758
10505
|
- /opt/app-root/src/run-role.sh
|
|
9759
10506
|
- suite_app_install
|
|
9760
|
-
image: quay.io/ibmmas/cli:11.
|
|
10507
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9761
10508
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9762
10509
|
|
|
9763
10510
|
workspaces:
|
|
@@ -9846,7 +10593,7 @@ spec:
|
|
|
9846
10593
|
command:
|
|
9847
10594
|
- /opt/app-root/src/run-role.sh
|
|
9848
10595
|
- suite_app_rollback
|
|
9849
|
-
image: quay.io/ibmmas/cli:11.
|
|
10596
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9850
10597
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9851
10598
|
# --------------------------------------------------------------------------------
|
|
9852
10599
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
|
|
@@ -9909,7 +10656,7 @@ spec:
|
|
|
9909
10656
|
command:
|
|
9910
10657
|
- /opt/app-root/src/run-role.sh
|
|
9911
10658
|
- suite_app_uninstall
|
|
9912
|
-
image: quay.io/ibmmas/cli:11.
|
|
10659
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9913
10660
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9914
10661
|
# --------------------------------------------------------------------------------
|
|
9915
10662
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
|
|
@@ -9984,7 +10731,7 @@ spec:
|
|
|
9984
10731
|
command:
|
|
9985
10732
|
- /opt/app-root/src/run-role.sh
|
|
9986
10733
|
- suite_app_upgrade
|
|
9987
|
-
image: quay.io/ibmmas/cli:11.
|
|
10734
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
9988
10735
|
imagePullPolicy: $(params.image_pull_policy)
|
|
9989
10736
|
# --------------------------------------------------------------------------------
|
|
9990
10737
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
|
|
@@ -10085,7 +10832,7 @@ spec:
|
|
|
10085
10832
|
command:
|
|
10086
10833
|
- /opt/app-root/src/run-role.sh
|
|
10087
10834
|
- suite_app_verify
|
|
10088
|
-
image: quay.io/ibmmas/cli:11.
|
|
10835
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10089
10836
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10090
10837
|
# --------------------------------------------------------------------------------
|
|
10091
10838
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
|
|
@@ -10228,7 +10975,7 @@ spec:
|
|
|
10228
10975
|
command:
|
|
10229
10976
|
- /opt/app-root/src/run-role.sh
|
|
10230
10977
|
- suite_certs
|
|
10231
|
-
image: quay.io/ibmmas/cli:11.
|
|
10978
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10232
10979
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10233
10980
|
|
|
10234
10981
|
workspaces:
|
|
@@ -10295,7 +11042,7 @@ spec:
|
|
|
10295
11042
|
command:
|
|
10296
11043
|
- /opt/app-root/src/run-role.sh
|
|
10297
11044
|
- suite_config
|
|
10298
|
-
image: quay.io/ibmmas/cli:11.
|
|
11045
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10299
11046
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10300
11047
|
workingDir: /workspace/configs
|
|
10301
11048
|
|
|
@@ -10366,7 +11113,7 @@ spec:
|
|
|
10366
11113
|
command:
|
|
10367
11114
|
- /opt/app-root/src/run-role.sh
|
|
10368
11115
|
- suite_db2_setup_for_manage
|
|
10369
|
-
image: quay.io/ibmmas/cli:11.
|
|
11116
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10370
11117
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10371
11118
|
# --------------------------------------------------------------------------------
|
|
10372
11119
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
|
|
@@ -10556,7 +11303,7 @@ spec:
|
|
|
10556
11303
|
command:
|
|
10557
11304
|
- /opt/app-root/src/run-role.sh
|
|
10558
11305
|
- suite_dns
|
|
10559
|
-
image: quay.io/ibmmas/cli:11.
|
|
11306
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10560
11307
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10561
11308
|
# --------------------------------------------------------------------------------
|
|
10562
11309
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
|
|
@@ -10805,7 +11552,7 @@ spec:
|
|
|
10805
11552
|
command:
|
|
10806
11553
|
- /opt/app-root/src/run-role.sh
|
|
10807
11554
|
- suite_install
|
|
10808
|
-
image: quay.io/ibmmas/cli:11.
|
|
11555
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10809
11556
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10810
11557
|
workingDir: /workspace/configs
|
|
10811
11558
|
|
|
@@ -10893,7 +11640,7 @@ spec:
|
|
|
10893
11640
|
command:
|
|
10894
11641
|
- /opt/app-root/src/run-role.sh
|
|
10895
11642
|
- suite_rollback
|
|
10896
|
-
image: quay.io/ibmmas/cli:11.
|
|
11643
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10897
11644
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10898
11645
|
# --------------------------------------------------------------------------------
|
|
10899
11646
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
|
|
@@ -10958,7 +11705,7 @@ spec:
|
|
|
10958
11705
|
command:
|
|
10959
11706
|
- /opt/app-root/src/run-role.sh
|
|
10960
11707
|
- suite_uninstall
|
|
10961
|
-
image: quay.io/ibmmas/cli:11.
|
|
11708
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
10962
11709
|
imagePullPolicy: $(params.image_pull_policy)
|
|
10963
11710
|
# --------------------------------------------------------------------------------
|
|
10964
11711
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
|
|
@@ -11028,7 +11775,7 @@ spec:
|
|
|
11028
11775
|
command:
|
|
11029
11776
|
- /opt/app-root/src/run-role.sh
|
|
11030
11777
|
- suite_upgrade
|
|
11031
|
-
image: quay.io/ibmmas/cli:11.
|
|
11778
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11032
11779
|
imagePullPolicy: $(params.image_pull_policy)
|
|
11033
11780
|
# --------------------------------------------------------------------------------
|
|
11034
11781
|
# /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
|
|
@@ -11090,12 +11837,12 @@ spec:
|
|
|
11090
11837
|
command:
|
|
11091
11838
|
- /opt/app-root/src/run-role.sh
|
|
11092
11839
|
- suite_verify
|
|
11093
|
-
image: quay.io/ibmmas/cli:11.
|
|
11840
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11094
11841
|
imagePullPolicy: $(params.image_pull_policy)
|
|
11095
11842
|
|
|
11096
11843
|
# If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
|
|
11097
11844
|
- name: suite-post-verify
|
|
11098
|
-
image: quay.io/ibmmas/cli:11.
|
|
11845
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11099
11846
|
imagePullPolicy: $(params.image_pull_policy)
|
|
11100
11847
|
command:
|
|
11101
11848
|
- /opt/app-root/src/wait-for-configmap.sh
|
|
@@ -11224,7 +11971,7 @@ spec:
|
|
|
11224
11971
|
command:
|
|
11225
11972
|
- /opt/app-root/src/run-role.sh
|
|
11226
11973
|
- turbonomic
|
|
11227
|
-
image: quay.io/ibmmas/cli:11.
|
|
11974
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11228
11975
|
imagePullPolicy: $(params.image_pull_policy)
|
|
11229
11976
|
# --------------------------------------------------------------------------------
|
|
11230
11977
|
# /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
|
|
@@ -11305,7 +12052,7 @@ spec:
|
|
|
11305
12052
|
# IBM User Data Services (UDS)
|
|
11306
12053
|
# -------------------------------------------------------------------------
|
|
11307
12054
|
- name: uds
|
|
11308
|
-
image: quay.io/ibmmas/cli:11.
|
|
12055
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11309
12056
|
imagePullPolicy: $(params.image_pull_policy)
|
|
11310
12057
|
workingDir: /workspace/configs
|
|
11311
12058
|
command:
|
|
@@ -11368,7 +12115,7 @@ spec:
|
|
|
11368
12115
|
# IBM Data Reporter Operator (DRO)
|
|
11369
12116
|
# -------------------------------------------------------------------------
|
|
11370
12117
|
- name: dro
|
|
11371
|
-
image: quay.io/ibmmas/cli:11.
|
|
12118
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11372
12119
|
imagePullPolicy: $(params.image_pull_policy)
|
|
11373
12120
|
workingDir: /workspace/configs
|
|
11374
12121
|
command:
|
|
@@ -11454,7 +12201,7 @@ spec:
|
|
|
11454
12201
|
|
|
11455
12202
|
steps:
|
|
11456
12203
|
- name: update-configmap
|
|
11457
|
-
image: quay.io/ibmmas/cli:11.
|
|
12204
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11458
12205
|
command:
|
|
11459
12206
|
- /opt/app-root/src/update-configmap.sh
|
|
11460
12207
|
env:
|
|
@@ -11516,7 +12263,7 @@ spec:
|
|
|
11516
12263
|
|
|
11517
12264
|
steps:
|
|
11518
12265
|
- name: wait-for-configmap
|
|
11519
|
-
image: quay.io/ibmmas/cli:11.
|
|
12266
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11520
12267
|
command:
|
|
11521
12268
|
- /opt/app-root/src/wait-for-configmap.sh
|
|
11522
12269
|
env:
|
|
@@ -11580,7 +12327,7 @@ spec:
|
|
|
11580
12327
|
|
|
11581
12328
|
steps:
|
|
11582
12329
|
- name: wait
|
|
11583
|
-
image: quay.io/ibmmas/cli:11.
|
|
12330
|
+
image: quay.io/ibmmas/cli:11.6.0
|
|
11584
12331
|
command:
|
|
11585
12332
|
- /opt/app-root/src/wait-for-tekton.sh
|
|
11586
12333
|
env:
|
|
@@ -17061,77 +17808,322 @@ spec:
|
|
|
17061
17808
|
operator: in
|
|
17062
17809
|
values: ["provision"]
|
|
17063
17810
|
# --------------------------------------------------------------------------------
|
|
17064
|
-
# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-
|
|
17811
|
+
# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-deps.yaml
|
|
17065
17812
|
# --------------------------------------------------------------------------------
|
|
17066
17813
|
---
|
|
17067
17814
|
apiVersion: tekton.dev/v1beta1
|
|
17068
17815
|
kind: Pipeline
|
|
17069
17816
|
metadata:
|
|
17070
|
-
name: gitops-mas-
|
|
17817
|
+
name: gitops-mas-deps
|
|
17071
17818
|
spec:
|
|
17819
|
+
description: MAS Cluster off-cluster dependencies
|
|
17072
17820
|
workspaces:
|
|
17073
17821
|
- name: configs
|
|
17074
|
-
- name: shared-additional-configs
|
|
17075
|
-
|
|
17076
|
-
description: Gitops MAS FVT pipeline
|
|
17077
17822
|
params:
|
|
17078
17823
|
- name: cluster_name
|
|
17079
17824
|
type: string
|
|
17080
|
-
- name:
|
|
17081
|
-
type: string
|
|
17082
|
-
- name: region_id
|
|
17083
|
-
type: string
|
|
17084
|
-
- name: cluster_url
|
|
17085
|
-
type: string
|
|
17086
|
-
- name: devops_build_number
|
|
17087
|
-
type: string
|
|
17088
|
-
- name: launcher_id
|
|
17825
|
+
- name: account
|
|
17089
17826
|
type: string
|
|
17090
17827
|
- name: mas_instance_id
|
|
17091
17828
|
type: string
|
|
17092
|
-
- name:
|
|
17829
|
+
- name: secrets_path
|
|
17093
17830
|
type: string
|
|
17094
17831
|
- name: avp_aws_secret_region
|
|
17095
17832
|
type: string
|
|
17096
|
-
- name:
|
|
17833
|
+
- name: avp_aws_secret_key
|
|
17097
17834
|
type: string
|
|
17098
|
-
- name:
|
|
17835
|
+
- name: avp_aws_access_key
|
|
17099
17836
|
type: string
|
|
17100
|
-
- name:
|
|
17837
|
+
- name: github_pat
|
|
17101
17838
|
type: string
|
|
17102
|
-
|
|
17839
|
+
|
|
17840
|
+
- name: vpc_ipv4_cidr
|
|
17103
17841
|
type: string
|
|
17104
|
-
- name:
|
|
17842
|
+
- name: mongo_provider
|
|
17105
17843
|
type: string
|
|
17106
|
-
|
|
17844
|
+
default: aws
|
|
17845
|
+
- name: aws_docdb_instance_number
|
|
17107
17846
|
type: string
|
|
17108
|
-
|
|
17847
|
+
default: 3
|
|
17848
|
+
- name: aws_docdb_engine_version
|
|
17109
17849
|
type: string
|
|
17850
|
+
default: 4.0.0
|
|
17110
17851
|
|
|
17111
|
-
- name:
|
|
17112
|
-
type: string
|
|
17113
|
-
- name: ivt_version_core
|
|
17852
|
+
- name: kafka_provider
|
|
17114
17853
|
type: string
|
|
17115
|
-
|
|
17854
|
+
default: aws
|
|
17855
|
+
- name: kafka_version
|
|
17116
17856
|
type: string
|
|
17117
|
-
|
|
17857
|
+
default: 3.3.1
|
|
17858
|
+
- name: kafka_action
|
|
17118
17859
|
type: string
|
|
17119
|
-
- name:
|
|
17860
|
+
- name: kafkacfg_file_name
|
|
17120
17861
|
type: string
|
|
17121
|
-
|
|
17862
|
+
default: ""
|
|
17863
|
+
- name: aws_msk_instance_type
|
|
17122
17864
|
type: string
|
|
17123
|
-
|
|
17865
|
+
default: ""
|
|
17866
|
+
|
|
17867
|
+
- name: efs_action
|
|
17124
17868
|
type: string
|
|
17125
|
-
|
|
17869
|
+
description: efs action to be performed (provision or deprovision)
|
|
17870
|
+
default: ""
|
|
17871
|
+
- name: cloud_provider
|
|
17126
17872
|
type: string
|
|
17127
|
-
|
|
17873
|
+
default: aws
|
|
17874
|
+
|
|
17875
|
+
- name: cos_type
|
|
17128
17876
|
type: string
|
|
17129
|
-
|
|
17877
|
+
description: COS Provider (ibm or ocs)
|
|
17878
|
+
default: ""
|
|
17879
|
+
- name: ibmcloud_resourcegroup
|
|
17130
17880
|
type: string
|
|
17131
|
-
|
|
17132
|
-
|
|
17881
|
+
description: Name of an existing COS Resource Group in IBM Cloud account
|
|
17882
|
+
default: ""
|
|
17883
|
+
- name: cos_action
|
|
17133
17884
|
type: string
|
|
17134
|
-
|
|
17885
|
+
description: COS action to be performed (provision or deprovision)
|
|
17886
|
+
default: ""
|
|
17887
|
+
- name: cos_use_hmac
|
|
17888
|
+
type: string
|
|
17889
|
+
description: Optional boolean variable weather hmac is enabled or not
|
|
17890
|
+
default: ""
|
|
17891
|
+
|
|
17892
|
+
- name: ibmcloud_apikey
|
|
17893
|
+
type: string
|
|
17894
|
+
default: ""
|
|
17895
|
+
|
|
17896
|
+
tasks:
|
|
17897
|
+
- name: gitops-mongo
|
|
17898
|
+
params:
|
|
17899
|
+
- name: cluster_name
|
|
17900
|
+
value: $(params.cluster_name)
|
|
17901
|
+
- name: account
|
|
17902
|
+
value: $(params.account)
|
|
17903
|
+
- name: secrets_path
|
|
17904
|
+
value: $(params.secrets_path)
|
|
17905
|
+
- name: avp_aws_secret_region
|
|
17906
|
+
value: $(params.avp_aws_secret_region)
|
|
17907
|
+
- name: avp_aws_secret_key
|
|
17908
|
+
value: $(params.avp_aws_secret_key)
|
|
17909
|
+
- name: avp_aws_access_key
|
|
17910
|
+
value: $(params.avp_aws_access_key)
|
|
17911
|
+
- name: vpc_ipv4_cidr
|
|
17912
|
+
value: $(params.vpc_ipv4_cidr)
|
|
17913
|
+
- name: mongo_provider
|
|
17914
|
+
value: $(params.mongo_provider)
|
|
17915
|
+
- name: aws_docdb_instance_number
|
|
17916
|
+
value: $(params.aws_docdb_instance_number)
|
|
17917
|
+
- name: aws_docdb_engine_version
|
|
17918
|
+
value: $(params.aws_docdb_engine_version)
|
|
17919
|
+
taskRef:
|
|
17920
|
+
kind: Task
|
|
17921
|
+
name: gitops-mongo
|
|
17922
|
+
workspaces:
|
|
17923
|
+
- name: configs
|
|
17924
|
+
workspace: configs
|
|
17925
|
+
|
|
17926
|
+
# 2. Kafka
|
|
17927
|
+
# -------------------------------------------------------------------------
|
|
17928
|
+
- name: gitops-kafka
|
|
17929
|
+
params:
|
|
17930
|
+
- name: secrets_path
|
|
17931
|
+
value: $(params.secrets_path)
|
|
17932
|
+
- name: avp_aws_secret_region
|
|
17933
|
+
value: $(params.avp_aws_secret_region)
|
|
17934
|
+
|
|
17935
|
+
- name: cluster_name
|
|
17936
|
+
value: $(params.cluster_name)
|
|
17937
|
+
- name: account
|
|
17938
|
+
value: $(params.account)
|
|
17939
|
+
|
|
17940
|
+
- name: mas_instance_id
|
|
17941
|
+
value: $(params.mas_instance_id)
|
|
17942
|
+
|
|
17943
|
+
- name: avp_aws_secret_key
|
|
17944
|
+
value: $(params.avp_aws_secret_key)
|
|
17945
|
+
- name: avp_aws_access_key
|
|
17946
|
+
value: $(params.avp_aws_access_key)
|
|
17947
|
+
|
|
17948
|
+
- name: kafka_provider
|
|
17949
|
+
value: $(params.kafka_provider)
|
|
17950
|
+
- name: kafka_version
|
|
17951
|
+
value: $(params.kafka_version)
|
|
17952
|
+
- name: vpc_ipv4_cidr
|
|
17953
|
+
value: $(params.vpc_ipv4_cidr)
|
|
17954
|
+
- name: kafkacfg_file_name
|
|
17955
|
+
value: $(params.kafkacfg_file_name)
|
|
17956
|
+
- name: aws_msk_instance_type
|
|
17957
|
+
value: $(params.aws_msk_instance_type)
|
|
17958
|
+
|
|
17959
|
+
workspaces:
|
|
17960
|
+
- name: configs
|
|
17961
|
+
workspace: configs
|
|
17962
|
+
taskRef:
|
|
17963
|
+
kind: Task
|
|
17964
|
+
name: gitops-kafka
|
|
17965
|
+
when:
|
|
17966
|
+
- input: "$(params.kafka_action)"
|
|
17967
|
+
operator: notin
|
|
17968
|
+
values: [""]
|
|
17969
|
+
|
|
17970
|
+
# Install Cloud Object Storage (COS)
|
|
17971
|
+
- name: gitops-cos
|
|
17972
|
+
params:
|
|
17973
|
+
- name: secrets_path
|
|
17974
|
+
value: $(params.secrets_path)
|
|
17975
|
+
- name: avp_aws_secret_region
|
|
17976
|
+
value: $(params.avp_aws_secret_region)
|
|
17977
|
+
|
|
17978
|
+
- name: github_pat
|
|
17979
|
+
value: $(params.github_pat)
|
|
17980
|
+
|
|
17981
|
+
- name: cluster_name
|
|
17982
|
+
value: $(params.cluster_name)
|
|
17983
|
+
- name: account
|
|
17984
|
+
value: $(params.account)
|
|
17985
|
+
- name: avp_aws_secret_key
|
|
17986
|
+
value: $(params.avp_aws_secret_key)
|
|
17987
|
+
- name: avp_aws_access_key
|
|
17988
|
+
value: $(params.avp_aws_access_key)
|
|
17989
|
+
|
|
17990
|
+
- name: mas_instance_id
|
|
17991
|
+
value: $(params.mas_instance_id)
|
|
17992
|
+
|
|
17993
|
+
- name: cos_action
|
|
17994
|
+
value: $(params.cos_action)
|
|
17995
|
+
- name: cos_type
|
|
17996
|
+
value: $(params.cos_type)
|
|
17997
|
+
- name: ibmcloud_resourcegroup
|
|
17998
|
+
value: $(params.ibmcloud_resourcegroup)
|
|
17999
|
+
- name: ibmcloud_apikey
|
|
18000
|
+
value: $(params.ibmcloud_apikey)
|
|
18001
|
+
- name: cos_use_hmac
|
|
18002
|
+
value: $(params.cos_use_hmac)
|
|
18003
|
+
|
|
18004
|
+
workspaces:
|
|
18005
|
+
- name: configs
|
|
18006
|
+
workspace: configs
|
|
18007
|
+
|
|
18008
|
+
taskRef:
|
|
18009
|
+
kind: Task
|
|
18010
|
+
name: gitops-cos
|
|
18011
|
+
when:
|
|
18012
|
+
- input: "$(params.cos_action)"
|
|
18013
|
+
operator: notin
|
|
18014
|
+
values: [""]
|
|
18015
|
+
- input: "$(params.cos_action)"
|
|
18016
|
+
operator: in
|
|
18017
|
+
values: ["provision"]
|
|
18018
|
+
|
|
18019
|
+
# Install AWS Elastic File Service (EFS)
|
|
18020
|
+
- name: gitops-efs
|
|
18021
|
+
params:
|
|
18022
|
+
- name: secrets_path
|
|
18023
|
+
value: $(params.secrets_path)
|
|
18024
|
+
- name: avp_aws_secret_region
|
|
18025
|
+
value: $(params.avp_aws_secret_region)
|
|
18026
|
+
- name: cluster_name
|
|
18027
|
+
value: $(params.cluster_name)
|
|
18028
|
+
- name: mas_instance_id
|
|
18029
|
+
value: $(params.mas_instance_id)
|
|
18030
|
+
- name: cloud_provider
|
|
18031
|
+
value: $(params.cloud_provider)
|
|
18032
|
+
- name: avp_aws_secret_key
|
|
18033
|
+
value: $(params.avp_aws_secret_key)
|
|
18034
|
+
- name: avp_aws_access_key
|
|
18035
|
+
value: $(params.avp_aws_access_key)
|
|
18036
|
+
- name: efs_action
|
|
18037
|
+
value: $(params.efs_action)
|
|
18038
|
+
|
|
18039
|
+
workspaces:
|
|
18040
|
+
- name: configs
|
|
18041
|
+
workspace: configs
|
|
18042
|
+
|
|
18043
|
+
taskRef:
|
|
18044
|
+
kind: Task
|
|
18045
|
+
name: gitops-efs
|
|
18046
|
+
when:
|
|
18047
|
+
- input: "$(params.efs_action)"
|
|
18048
|
+
operator: notin
|
|
18049
|
+
values: [""]
|
|
18050
|
+
- input: "$(params.efs_action)"
|
|
18051
|
+
operator: in
|
|
18052
|
+
values: ["provision"]
|
|
18053
|
+
# --------------------------------------------------------------------------------
|
|
18054
|
+
# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-fvt-preparer-pipeline.yaml
|
|
18055
|
+
# --------------------------------------------------------------------------------
|
|
18056
|
+
---
|
|
18057
|
+
apiVersion: tekton.dev/v1beta1
|
|
18058
|
+
kind: Pipeline
|
|
18059
|
+
metadata:
|
|
18060
|
+
name: gitops-mas-fvt-preparer-pipeline
|
|
18061
|
+
spec:
|
|
18062
|
+
workspaces:
|
|
18063
|
+
- name: configs
|
|
18064
|
+
- name: shared-additional-configs
|
|
18065
|
+
|
|
18066
|
+
description: Gitops MAS FVT pipeline
|
|
18067
|
+
params:
|
|
18068
|
+
- name: cluster_name
|
|
18069
|
+
type: string
|
|
18070
|
+
- name: account_id
|
|
18071
|
+
type: string
|
|
18072
|
+
- name: region_id
|
|
18073
|
+
type: string
|
|
18074
|
+
- name: cluster_url
|
|
18075
|
+
type: string
|
|
18076
|
+
- name: devops_build_number
|
|
18077
|
+
type: string
|
|
18078
|
+
- name: launcher_id
|
|
18079
|
+
type: string
|
|
18080
|
+
- name: mas_instance_id
|
|
18081
|
+
type: string
|
|
18082
|
+
- name: pipeline_storage_class
|
|
18083
|
+
type: string
|
|
18084
|
+
- name: avp_aws_secret_region
|
|
18085
|
+
type: string
|
|
18086
|
+
- name: fvt_pipeline_name
|
|
18087
|
+
type: string
|
|
18088
|
+
- name: cli_version
|
|
18089
|
+
type: string
|
|
18090
|
+
- name: fvt_config
|
|
18091
|
+
type: string
|
|
18092
|
+
- name: fvt_image_registry
|
|
18093
|
+
type: string
|
|
18094
|
+
- name: artifactory_generic_release_url
|
|
18095
|
+
type: string
|
|
18096
|
+
- name: artifactory_generic_logs_url
|
|
18097
|
+
type: string
|
|
18098
|
+
- name: fvt_ansible_version
|
|
18099
|
+
type: string
|
|
18100
|
+
|
|
18101
|
+
- name: fvt_version_core
|
|
18102
|
+
type: string
|
|
18103
|
+
- name: ivt_version_core
|
|
18104
|
+
type: string
|
|
18105
|
+
- name: fvt_version_ctf
|
|
18106
|
+
type: string
|
|
18107
|
+
- name: fvt_version_predict
|
|
18108
|
+
type: string
|
|
18109
|
+
- name: fvt_version_assist
|
|
18110
|
+
type: string
|
|
18111
|
+
- name: fvt_version_iot
|
|
18112
|
+
type: string
|
|
18113
|
+
- name: fvt_version_optimizer
|
|
18114
|
+
type: string
|
|
18115
|
+
- name: fvt_version_manage
|
|
18116
|
+
type: string
|
|
18117
|
+
- name: fvt_version_mobile
|
|
18118
|
+
type: string
|
|
18119
|
+
- name: fvt_version_data_dictionary
|
|
18120
|
+
type: string
|
|
18121
|
+
- name: fvt_version_sls
|
|
18122
|
+
type: string
|
|
18123
|
+
|
|
18124
|
+
- name: fvt_blacklist_core
|
|
18125
|
+
type: string
|
|
18126
|
+
- name: fvt_whitelist_core
|
|
17135
18127
|
type: string
|
|
17136
18128
|
- name: fvt_blacklist_manage
|
|
17137
18129
|
type: string
|
|
@@ -17266,6 +18258,8 @@ spec:
|
|
|
17266
18258
|
value: $(params.ivt_version_core)
|
|
17267
18259
|
- name: fvt_version_ctf
|
|
17268
18260
|
value: $(params.fvt_version_ctf)
|
|
18261
|
+
- name: fvt_version_predict
|
|
18262
|
+
value: $(params.fvt_version_predict)
|
|
17269
18263
|
- name: fvt_version_assist
|
|
17270
18264
|
value: $(params.fvt_version_assist)
|
|
17271
18265
|
- name: fvt_version_iot
|
|
@@ -17330,50 +18324,252 @@ spec:
|
|
|
17330
18324
|
value: $(params.mas_app_channel_manage)
|
|
17331
18325
|
- name: mas_app_channel_monitor
|
|
17332
18326
|
value: $(params.mas_app_channel_monitor)
|
|
17333
|
-
- name: mas_app_channel_visualinspection
|
|
17334
|
-
value: $(params.mas_app_channel_visualinspection)
|
|
17335
|
-
- name: mas_app_channel_assist
|
|
17336
|
-
value: $(params.mas_app_channel_assist)
|
|
18327
|
+
- name: mas_app_channel_visualinspection
|
|
18328
|
+
value: $(params.mas_app_channel_visualinspection)
|
|
18329
|
+
- name: mas_app_channel_assist
|
|
18330
|
+
value: $(params.mas_app_channel_assist)
|
|
18331
|
+
- name: mas_app_channel_optimizer
|
|
18332
|
+
value: $(params.mas_app_channel_optimizer)
|
|
18333
|
+
- name: mas_app_channel_predict
|
|
18334
|
+
value: $(params.mas_app_channel_predict)
|
|
18335
|
+
|
|
18336
|
+
- name: ldap_url
|
|
18337
|
+
value: $(params.ldap_url)
|
|
18338
|
+
- name: ldap_basedn
|
|
18339
|
+
value: $(params.ldap_basedn)
|
|
18340
|
+
- name: ldap_userid_map
|
|
18341
|
+
value: $(params.ldap_userid_map)
|
|
18342
|
+
|
|
18343
|
+
workspaces:
|
|
18344
|
+
- name: configs
|
|
18345
|
+
workspace: configs
|
|
18346
|
+
- name: shared-additional-configs
|
|
18347
|
+
workspace: shared-additional-configs
|
|
18348
|
+
taskRef:
|
|
18349
|
+
kind: Task
|
|
18350
|
+
name: gitops-mas-fvt-preparer
|
|
18351
|
+
# --------------------------------------------------------------------------------
|
|
18352
|
+
# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-initiator-after-provision.yaml
|
|
18353
|
+
# --------------------------------------------------------------------------------
|
|
18354
|
+
---
|
|
18355
|
+
apiVersion: tekton.dev/v1beta1
|
|
18356
|
+
kind: Pipeline
|
|
18357
|
+
metadata:
|
|
18358
|
+
name: gitops-mas-initiator-after-provision
|
|
18359
|
+
spec:
|
|
18360
|
+
description: Initials the gitops deployment of MAS
|
|
18361
|
+
workspaces:
|
|
18362
|
+
- name: configs
|
|
18363
|
+
params:
|
|
18364
|
+
# Name of the PipelineRun to wait for
|
|
18365
|
+
- name: pipelinerun_name
|
|
18366
|
+
type: string
|
|
18367
|
+
- name: ignore_failure
|
|
18368
|
+
type: string
|
|
18369
|
+
default: "False"
|
|
18370
|
+
description: Set to 'True' or 'False' (case-sensitive) to configure whether this pipeline continue if the pipeline we are waiting for has failed.
|
|
18371
|
+
- name: cluster_name
|
|
18372
|
+
type: string
|
|
18373
|
+
- name: account
|
|
18374
|
+
type: string
|
|
18375
|
+
- name: secrets_path
|
|
18376
|
+
type: string
|
|
18377
|
+
- name: avp_aws_secret_region
|
|
18378
|
+
type: string
|
|
18379
|
+
- name: avp_aws_secret_key
|
|
18380
|
+
type: string
|
|
18381
|
+
- name: avp_aws_access_key
|
|
18382
|
+
type: string
|
|
18383
|
+
- name: region
|
|
18384
|
+
type: string
|
|
18385
|
+
- name: github_host
|
|
18386
|
+
type: string
|
|
18387
|
+
- name: target_git_branch
|
|
18388
|
+
type: string
|
|
18389
|
+
- name: target_github_org
|
|
18390
|
+
type: string
|
|
18391
|
+
- name: target_github_repo
|
|
18392
|
+
type: string
|
|
18393
|
+
- name: source_git_branch
|
|
18394
|
+
type: string
|
|
18395
|
+
- name: source_github_org
|
|
18396
|
+
type: string
|
|
18397
|
+
- name: source_github_repo
|
|
18398
|
+
type: string
|
|
18399
|
+
- name: source_path
|
|
18400
|
+
type: string
|
|
18401
|
+
default: ""
|
|
18402
|
+
- name: mas_channel
|
|
18403
|
+
type: string
|
|
18404
|
+
- name: mas_operationalmode
|
|
18405
|
+
type: string
|
|
18406
|
+
default: ""
|
|
18407
|
+
- name: mas_instance_id
|
|
18408
|
+
type: string
|
|
18409
|
+
- name: mas_app_channel_assist
|
|
18410
|
+
type: string
|
|
18411
|
+
default: ""
|
|
18412
|
+
- name: mas_app_channel_iot
|
|
18413
|
+
type: string
|
|
18414
|
+
default: ""
|
|
18415
|
+
- name: mas_app_channel_manage
|
|
18416
|
+
type: string
|
|
18417
|
+
default: ""
|
|
18418
|
+
- name: mas_app_channel_monitor
|
|
18419
|
+
type: string
|
|
18420
|
+
default: ""
|
|
18421
|
+
- name: mas_app_channel_optimizer
|
|
18422
|
+
type: string
|
|
18423
|
+
default: ""
|
|
18424
|
+
- name: mas_app_channel_predict
|
|
18425
|
+
type: string
|
|
18426
|
+
default: ""
|
|
18427
|
+
- name: mas_app_channel_visualinspection
|
|
18428
|
+
type: string
|
|
18429
|
+
default: ""
|
|
18430
|
+
- name: github_pat
|
|
18431
|
+
type: string
|
|
18432
|
+
- name: ibmcloud_apikey
|
|
18433
|
+
type: string
|
|
18434
|
+
default: ""
|
|
18435
|
+
- name: avp_type
|
|
18436
|
+
type: string
|
|
18437
|
+
default: "aws"
|
|
18438
|
+
- name: secrets_key_seperator
|
|
18439
|
+
type: string
|
|
18440
|
+
default: "/"
|
|
18441
|
+
|
|
18442
|
+
- name: manual_certs_control_flag
|
|
18443
|
+
type: string
|
|
18444
|
+
default: ""
|
|
18445
|
+
- name: dns_provider_control_iden
|
|
18446
|
+
type: string
|
|
18447
|
+
default: ""
|
|
18448
|
+
|
|
18449
|
+
- name: cli_version
|
|
18450
|
+
type: string
|
|
18451
|
+
default: ""
|
|
18452
|
+
- name: fvt_ansible_version
|
|
18453
|
+
type: string
|
|
18454
|
+
default: ""
|
|
18455
|
+
- name: artifactory_username
|
|
18456
|
+
type: string
|
|
18457
|
+
default: ""
|
|
18458
|
+
- name: artifactory_token
|
|
18459
|
+
type: string
|
|
18460
|
+
default: ""
|
|
18461
|
+
tasks:
|
|
18462
|
+
# 0. Wait for the provsion pipeline to complete
|
|
18463
|
+
# -------------------------------------------------------------------------
|
|
18464
|
+
- name: wait-for-provision
|
|
18465
|
+
timeout: "0"
|
|
18466
|
+
taskRef:
|
|
18467
|
+
kind: Task
|
|
18468
|
+
name: mas-devops-wait-for-tekton
|
|
18469
|
+
params:
|
|
18470
|
+
- name: type
|
|
18471
|
+
value: pipelinerun
|
|
18472
|
+
- name: name
|
|
18473
|
+
value: $(params.pipelinerun_name)
|
|
18474
|
+
- name: delay
|
|
18475
|
+
value: 120 # seconds between checking the status of the pipelinerun
|
|
18476
|
+
- name: max_retries
|
|
18477
|
+
value: 120 # attempts before giving up
|
|
18478
|
+
- name: ignore_failure
|
|
18479
|
+
value: $(params.ignore_failure) # fails and exit once the first failure is detected
|
|
18480
|
+
- name: gitops-mas-initiator
|
|
18481
|
+
runAfter:
|
|
18482
|
+
- wait-for-provision
|
|
18483
|
+
params:
|
|
18484
|
+
- name: cluster_name
|
|
18485
|
+
value: $(params.cluster_name)
|
|
18486
|
+
- name: account
|
|
18487
|
+
value: $(params.account)
|
|
18488
|
+
- name: region
|
|
18489
|
+
value: $(params.region)
|
|
18490
|
+
- name: github_host
|
|
18491
|
+
value: $(params.github_host)
|
|
18492
|
+
- name: target_git_branch
|
|
18493
|
+
value: $(params.target_git_branch)
|
|
18494
|
+
- name: target_github_org
|
|
18495
|
+
value: $(params.target_github_org)
|
|
18496
|
+
- name: secrets_path
|
|
18497
|
+
value: $(params.secrets_path)
|
|
18498
|
+
- name: avp_aws_secret_region
|
|
18499
|
+
value: $(params.avp_aws_secret_region)
|
|
18500
|
+
- name: avp_aws_secret_key
|
|
18501
|
+
value: $(params.avp_aws_secret_key)
|
|
18502
|
+
- name: avp_aws_access_key
|
|
18503
|
+
value: $(params.avp_aws_access_key)
|
|
18504
|
+
- name: ibmcloud_apikey
|
|
18505
|
+
value: $(params.ibmcloud_apikey)
|
|
18506
|
+
- name: avp_type
|
|
18507
|
+
value: $(params.avp_type)
|
|
18508
|
+
- name: secrets_key_seperator
|
|
18509
|
+
value: $(params.secrets_key_seperator)
|
|
18510
|
+
- name: target_github_repo
|
|
18511
|
+
value: $(params.target_github_repo)
|
|
18512
|
+
- name: source_git_branch
|
|
18513
|
+
value: $(params.source_git_branch)
|
|
18514
|
+
- name: source_github_org
|
|
18515
|
+
value: $(params.source_github_org)
|
|
18516
|
+
- name: source_github_repo
|
|
18517
|
+
value: $(params.source_github_repo)
|
|
18518
|
+
- name: source_path
|
|
18519
|
+
value: $(params.source_path)
|
|
18520
|
+
- name: mas_channel
|
|
18521
|
+
value: $(params.mas_channel)
|
|
18522
|
+
- name: mas_operationalmode
|
|
18523
|
+
value: $(params.mas_operationalmode)
|
|
18524
|
+
- name: mas_instance_id
|
|
18525
|
+
value: $(params.mas_instance_id)
|
|
18526
|
+
- name: mas_app_channel_assist
|
|
18527
|
+
value: $(params.mas_app_channel_assist)
|
|
18528
|
+
- name: mas_app_channel_iot
|
|
18529
|
+
value: $(params.mas_app_channel_iot)
|
|
18530
|
+
- name: mas_app_channel_manage
|
|
18531
|
+
value: $(params.mas_app_channel_manage)
|
|
18532
|
+
- name: mas_app_channel_monitor
|
|
18533
|
+
value: $(params.mas_app_channel_monitor)
|
|
17337
18534
|
- name: mas_app_channel_optimizer
|
|
17338
18535
|
value: $(params.mas_app_channel_optimizer)
|
|
17339
18536
|
- name: mas_app_channel_predict
|
|
17340
18537
|
value: $(params.mas_app_channel_predict)
|
|
17341
|
-
|
|
17342
|
-
|
|
17343
|
-
|
|
17344
|
-
|
|
17345
|
-
|
|
17346
|
-
|
|
17347
|
-
|
|
17348
|
-
|
|
18538
|
+
- name: mas_app_channel_visualinspection
|
|
18539
|
+
value: $(params.mas_app_channel_visualinspection)
|
|
18540
|
+
- name: github_pat
|
|
18541
|
+
value: $(params.github_pat)
|
|
18542
|
+
- name: manual_certs_control_flag
|
|
18543
|
+
value: $(params.manual_certs_control_flag)
|
|
18544
|
+
- name: dns_provider_control_iden
|
|
18545
|
+
value: $(params.dns_provider_control_iden)
|
|
18546
|
+
- name: cli_version
|
|
18547
|
+
value: $(params.cli_version)
|
|
18548
|
+
- name: fvt_ansible_version
|
|
18549
|
+
value: $(params.fvt_ansible_version)
|
|
18550
|
+
- name: artifactory_username
|
|
18551
|
+
value: $(params.artifactory_username)
|
|
18552
|
+
- name: artifactory_token
|
|
18553
|
+
value: $(params.artifactory_token)
|
|
18554
|
+
taskRef:
|
|
18555
|
+
kind: Task
|
|
18556
|
+
name: gitops-mas-initiator
|
|
17349
18557
|
workspaces:
|
|
17350
18558
|
- name: configs
|
|
17351
18559
|
workspace: configs
|
|
17352
|
-
- name: shared-additional-configs
|
|
17353
|
-
workspace: shared-additional-configs
|
|
17354
|
-
taskRef:
|
|
17355
|
-
kind: Task
|
|
17356
|
-
name: gitops-mas-fvt-preparer
|
|
17357
18560
|
# --------------------------------------------------------------------------------
|
|
17358
|
-
# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-initiator
|
|
18561
|
+
# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-initiator.yaml
|
|
17359
18562
|
# --------------------------------------------------------------------------------
|
|
17360
18563
|
---
|
|
17361
18564
|
apiVersion: tekton.dev/v1beta1
|
|
17362
18565
|
kind: Pipeline
|
|
17363
18566
|
metadata:
|
|
17364
|
-
name: gitops-mas-initiator
|
|
18567
|
+
name: gitops-mas-initiator
|
|
17365
18568
|
spec:
|
|
17366
18569
|
description: Initials the gitops deployment of MAS
|
|
17367
18570
|
workspaces:
|
|
17368
18571
|
- name: configs
|
|
17369
18572
|
params:
|
|
17370
|
-
# Name of the PipelineRun to wait for
|
|
17371
|
-
- name: pipelinerun_name
|
|
17372
|
-
type: string
|
|
17373
|
-
- name: ignore_failure
|
|
17374
|
-
type: string
|
|
17375
|
-
default: "False"
|
|
17376
|
-
description: Set to 'True' or 'False' (case-sensitive) to configure whether this pipeline continue if the pipeline we are waiting for has failed.
|
|
17377
18573
|
- name: cluster_name
|
|
17378
18574
|
type: string
|
|
17379
18575
|
- name: account
|
|
@@ -17410,6 +18606,8 @@ spec:
|
|
|
17410
18606
|
- name: mas_operationalmode
|
|
17411
18607
|
type: string
|
|
17412
18608
|
default: ""
|
|
18609
|
+
- name: mas_instance_id
|
|
18610
|
+
type: string
|
|
17413
18611
|
- name: mas_app_channel_assist
|
|
17414
18612
|
type: string
|
|
17415
18613
|
default: ""
|
|
@@ -17463,27 +18661,7 @@ spec:
|
|
|
17463
18661
|
type: string
|
|
17464
18662
|
default: ""
|
|
17465
18663
|
tasks:
|
|
17466
|
-
# 0. Wait for the provsion pipeline to complete
|
|
17467
|
-
# -------------------------------------------------------------------------
|
|
17468
|
-
- name: wait-for-provision
|
|
17469
|
-
timeout: "0"
|
|
17470
|
-
taskRef:
|
|
17471
|
-
kind: Task
|
|
17472
|
-
name: mas-devops-wait-for-tekton
|
|
17473
|
-
params:
|
|
17474
|
-
- name: type
|
|
17475
|
-
value: pipelinerun
|
|
17476
|
-
- name: name
|
|
17477
|
-
value: $(params.pipelinerun_name)
|
|
17478
|
-
- name: delay
|
|
17479
|
-
value: 120 # seconds between checking the status of the pipelinerun
|
|
17480
|
-
- name: max_retries
|
|
17481
|
-
value: 120 # attempts before giving up
|
|
17482
|
-
- name: ignore_failure
|
|
17483
|
-
value: $(params.ignore_failure) # fails and exit once the first failure is detected
|
|
17484
18664
|
- name: gitops-mas-initiator
|
|
17485
|
-
runAfter:
|
|
17486
|
-
- wait-for-provision
|
|
17487
18665
|
params:
|
|
17488
18666
|
- name: cluster_name
|
|
17489
18667
|
value: $(params.cluster_name)
|
|
@@ -17525,6 +18703,8 @@ spec:
|
|
|
17525
18703
|
value: $(params.mas_channel)
|
|
17526
18704
|
- name: mas_operationalmode
|
|
17527
18705
|
value: $(params.mas_operationalmode)
|
|
18706
|
+
- name: mas_instance_id
|
|
18707
|
+
value: $(params.mas_instance_id)
|
|
17528
18708
|
- name: mas_app_channel_assist
|
|
17529
18709
|
value: $(params.mas_app_channel_assist)
|
|
17530
18710
|
- name: mas_app_channel_iot
|
|
@@ -18981,6 +20161,11 @@ spec:
|
|
|
18981
20161
|
type: string
|
|
18982
20162
|
description: Subscription channel for MVI application operator
|
|
18983
20163
|
default: ""
|
|
20164
|
+
# - name: mas_app_channel_aibroker
|
|
20165
|
+
# type: string
|
|
20166
|
+
# description: Subscription channel for AI Broker application operator
|
|
20167
|
+
# default: ""
|
|
20168
|
+
|
|
18984
20169
|
|
|
18985
20170
|
# MAS Configuration
|
|
18986
20171
|
# -----------------------------------------------------------------------------
|
|
@@ -19247,6 +20432,132 @@ spec:
|
|
|
19247
20432
|
description: controls the workload size of predict containers
|
|
19248
20433
|
default: "small"
|
|
19249
20434
|
|
|
20435
|
+
# Dependencies - IBM Maximo AI Broker
|
|
20436
|
+
# -----------------------------------------------------------------------------
|
|
20437
|
+
# MAS Application Configuration - IBM Maximo AI Broker
|
|
20438
|
+
# -----------------------------------------------------------------------------
|
|
20439
|
+
# - name: mas_aibroker_channel
|
|
20440
|
+
- name: mas_app_channel_aibroker
|
|
20441
|
+
type: string
|
|
20442
|
+
description: Default channel for IBM Maximo AI Broker
|
|
20443
|
+
default: ""
|
|
20444
|
+
- name: mas_aibroker_storage_accesskey
|
|
20445
|
+
type: string
|
|
20446
|
+
description: S3/Minio storage access ket for IBM Maximo AI Broker
|
|
20447
|
+
default: ""
|
|
20448
|
+
- name: mas_aibroker_storage_secretkey
|
|
20449
|
+
type: string
|
|
20450
|
+
description: S3/Minio storage secret key for IBM Maximo AI Broker
|
|
20451
|
+
default: ""
|
|
20452
|
+
- name: mas_aibroker_storage_host
|
|
20453
|
+
type: string
|
|
20454
|
+
description: S3/Minio storage host for IBM Maximo AI Broker
|
|
20455
|
+
default: ""
|
|
20456
|
+
- name: mas_aibroker_storage_region
|
|
20457
|
+
type: string
|
|
20458
|
+
description: S3/Minio storage region for IBM Maximo AI Broker
|
|
20459
|
+
default: ""
|
|
20460
|
+
- name: mas_aibroker_storage_port
|
|
20461
|
+
type: string
|
|
20462
|
+
description: S3/Minio storage port for IBM Maximo AI Broker
|
|
20463
|
+
default: ""
|
|
20464
|
+
- name: mas_aibroker_storage_ssl
|
|
20465
|
+
type: string
|
|
20466
|
+
description: S3/Minio storage ssl for IBM Maximo AI Broker
|
|
20467
|
+
default: ""
|
|
20468
|
+
- name: mas_aibroker_storage_provider
|
|
20469
|
+
type: string
|
|
20470
|
+
description: S3/Minio storage provider IBM Maximo AI Broker
|
|
20471
|
+
default: ""
|
|
20472
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
20473
|
+
type: string
|
|
20474
|
+
description: S3/Minio storage pipeline bucket for IBM Maximo AI Broker
|
|
20475
|
+
default: ""
|
|
20476
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
20477
|
+
type: string
|
|
20478
|
+
description: S3/Minio storage tenants bucket for IBM Maximo AI Broker
|
|
20479
|
+
default: ""
|
|
20480
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
20481
|
+
type: string
|
|
20482
|
+
description: S3/Minio storage template bucket for IBM Maximo AI Broker
|
|
20483
|
+
default: ""
|
|
20484
|
+
- name: mas_aibroker_tenant_name
|
|
20485
|
+
type: string
|
|
20486
|
+
description: Tenant name for IBM Maximo AI Broker
|
|
20487
|
+
default: ""
|
|
20488
|
+
- name: mas_aibroker_watsonxai_apikey
|
|
20489
|
+
type: string
|
|
20490
|
+
description: WatsonX api key for IBM Maximo AI Broker
|
|
20491
|
+
default: ""
|
|
20492
|
+
- name: mas_aibroker_watsonxai_url
|
|
20493
|
+
type: string
|
|
20494
|
+
description: WatsonX url for IBM Maximo AI Broker
|
|
20495
|
+
default: ""
|
|
20496
|
+
- name: mas_aibroker_watsonxai_project_id
|
|
20497
|
+
type: string
|
|
20498
|
+
description: WatsonX project ID for IBM Maximo AI Broker
|
|
20499
|
+
default: ""
|
|
20500
|
+
- name: mas_aibroker_watsonx_action
|
|
20501
|
+
type: string
|
|
20502
|
+
description: watsonx action for IBM Maximo AI Broker
|
|
20503
|
+
default: ""
|
|
20504
|
+
- name: mas_aibroker_apikey_action
|
|
20505
|
+
type: string
|
|
20506
|
+
description: AI Broker api key action for IBM Maximo AI Broker
|
|
20507
|
+
default: ""
|
|
20508
|
+
- name: mas_aibroker_s3_action
|
|
20509
|
+
type: string
|
|
20510
|
+
description: s3 action for IBM Maximo AI Broker
|
|
20511
|
+
default: ""
|
|
20512
|
+
- name: mas_aibroker_connector_tag
|
|
20513
|
+
type: string
|
|
20514
|
+
description: connector image tag for IBM Maximo AI Broker
|
|
20515
|
+
default: ""
|
|
20516
|
+
- name: mas_aibroker_controller_tag
|
|
20517
|
+
type: string
|
|
20518
|
+
description: controller image tag for IBM Maximo AI Broker
|
|
20519
|
+
default: ""
|
|
20520
|
+
- name: mas_aibroker_pipeline_steps_tag
|
|
20521
|
+
type: string
|
|
20522
|
+
description: pipeline steps image tag for IBM Maximo AI Broker
|
|
20523
|
+
default: ""
|
|
20524
|
+
- name: mas_aibroker_store_tag
|
|
20525
|
+
type: string
|
|
20526
|
+
description: store image tag for IBM Maximo AI Broker
|
|
20527
|
+
default: ""
|
|
20528
|
+
- name: mas_aibroker_watcher_tag
|
|
20529
|
+
type: string
|
|
20530
|
+
description: watcher image tag for IBM Maximo AI Broker
|
|
20531
|
+
default: ""
|
|
20532
|
+
- name: mas_aibroker_db_host
|
|
20533
|
+
type: string
|
|
20534
|
+
description: database host for IBM Maximo AI Broker
|
|
20535
|
+
default: ""
|
|
20536
|
+
- name: mas_aibroker_db_port
|
|
20537
|
+
type: string
|
|
20538
|
+
description: database port for IBM Maximo AI Broker
|
|
20539
|
+
default: ""
|
|
20540
|
+
- name: mas_aibroker_db_user
|
|
20541
|
+
type: string
|
|
20542
|
+
description: database user for IBM Maximo AI Broker
|
|
20543
|
+
default: ""
|
|
20544
|
+
- name: mas_aibroker_db_database
|
|
20545
|
+
type: string
|
|
20546
|
+
description: database name for IBM Maximo AI Broker
|
|
20547
|
+
default: ""
|
|
20548
|
+
- name: mas_aibroker_db_secret_name
|
|
20549
|
+
type: string
|
|
20550
|
+
description: database secret name for IBM Maximo AI Broker
|
|
20551
|
+
default: ""
|
|
20552
|
+
- name: mas_aibroker_db_secret_key
|
|
20553
|
+
type: string
|
|
20554
|
+
description: database secret key for IBM Maximo AI Broker
|
|
20555
|
+
default: ""
|
|
20556
|
+
- name: mas_aibroker_db_secret_value
|
|
20557
|
+
type: string
|
|
20558
|
+
description: database secret value for IBM Maximo AI Broker
|
|
20559
|
+
default: ""
|
|
20560
|
+
|
|
19250
20561
|
|
|
19251
20562
|
tasks:
|
|
19252
20563
|
# Content
|
|
@@ -20002,7 +21313,7 @@ spec:
|
|
|
20002
21313
|
name: mas-devops-cp4d
|
|
20003
21314
|
# Only needed if either Predict, Assist, Health w/ WSL, or Cognos are being installed
|
|
20004
21315
|
when:
|
|
20005
|
-
- input: "$(params.mas_app_channel_predict)$(params.
|
|
21316
|
+
- input: "$(params.mas_app_channel_predict)$(params.mas_appws_bindings_health_wsl_flag)$(params.cpd_install_cognos)$(params.cpd_install_all)"
|
|
20006
21317
|
operator: notin
|
|
20007
21318
|
values: [""]
|
|
20008
21319
|
runAfter:
|
|
@@ -21514,6 +22825,250 @@ spec:
|
|
|
21514
22825
|
- turbonomic
|
|
21515
22826
|
- cognos
|
|
21516
22827
|
|
|
22828
|
+
# 14 Install and configure AI Broker
|
|
22829
|
+
# -------------------------------------------------------------------------
|
|
22830
|
+
# 14.1 Install Opendatahub
|
|
22831
|
+
- name: odh
|
|
22832
|
+
params:
|
|
22833
|
+
# Controls the image pull policy for the ibmmas/cli image
|
|
22834
|
+
- name: image_pull_policy
|
|
22835
|
+
value: $(params.image_pull_policy)
|
|
22836
|
+
|
|
22837
|
+
- name: devops_suite_name
|
|
22838
|
+
value: odh
|
|
22839
|
+
|
|
22840
|
+
- name: mas_instance_id
|
|
22841
|
+
value: $(params.mas_instance_id)
|
|
22842
|
+
- name: mas_app_id
|
|
22843
|
+
value: aibroker
|
|
22844
|
+
- name: artifactory_username
|
|
22845
|
+
value: $(params.artifactory_username)
|
|
22846
|
+
- name: artifactory_token
|
|
22847
|
+
value: $(params.artifactory_token)
|
|
22848
|
+
- name: mas_app_channel
|
|
22849
|
+
value: "$(params.mas_app_channel_aibroker)"
|
|
22850
|
+
- name: ibm_entitlement_key
|
|
22851
|
+
value: $(params.ibm_entitlement_key)
|
|
22852
|
+
- name: custom_labels
|
|
22853
|
+
value: $(params.custom_labels)
|
|
22854
|
+
- name: mas_aibroker_storage_provider
|
|
22855
|
+
value: $(params.mas_aibroker_storage_provider)
|
|
22856
|
+
- name: mas_aibroker_storage_accesskey
|
|
22857
|
+
value: $(params.mas_aibroker_storage_accesskey)
|
|
22858
|
+
- name: mas_aibroker_storage_secretkey
|
|
22859
|
+
value: $(params.mas_aibroker_storage_secretkey)
|
|
22860
|
+
- name: mas_aibroker_storage_host
|
|
22861
|
+
value: $(params.mas_aibroker_storage_host)
|
|
22862
|
+
- name: mas_aibroker_storage_port
|
|
22863
|
+
value: $(params.mas_aibroker_storage_port)
|
|
22864
|
+
- name: mas_aibroker_storage_ssl
|
|
22865
|
+
value: $(params.mas_aibroker_storage_ssl)
|
|
22866
|
+
- name: mas_aibroker_storage_region
|
|
22867
|
+
value: $(params.mas_aibroker_storage_region)
|
|
22868
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
22869
|
+
value: $(params.mas_aibroker_storage_pipelines_bucket)
|
|
22870
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
22871
|
+
value: $(params.mas_aibroker_storage_tenants_bucket)
|
|
22872
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
22873
|
+
value: $(params.mas_aibroker_storage_templates_bucket)
|
|
22874
|
+
- name: mas_aibroker_tenant_name
|
|
22875
|
+
value: $(params.mas_aibroker_tenant_name)
|
|
22876
|
+
- name: mas_aibroker_db_host
|
|
22877
|
+
value: $(params.mas_aibroker_db_host)
|
|
22878
|
+
- name: mas_aibroker_db_port
|
|
22879
|
+
value: $(params.mas_aibroker_db_port)
|
|
22880
|
+
- name: mas_aibroker_db_user
|
|
22881
|
+
value: $(params.mas_aibroker_db_user)
|
|
22882
|
+
- name: mas_aibroker_db_database
|
|
22883
|
+
value: $(params.mas_aibroker_db_database)
|
|
22884
|
+
- name: mas_aibroker_db_secret_name
|
|
22885
|
+
value: $(params.mas_aibroker_db_secret_name)
|
|
22886
|
+
- name: mas_aibroker_db_secret_key
|
|
22887
|
+
value: $(params.mas_aibroker_db_secret_key)
|
|
22888
|
+
- name: mas_aibroker_db_secret_value
|
|
22889
|
+
value: $(params.mas_aibroker_db_secret_value)
|
|
22890
|
+
|
|
22891
|
+
taskRef:
|
|
22892
|
+
name: mas-devops-odh
|
|
22893
|
+
kind: Task
|
|
22894
|
+
when:
|
|
22895
|
+
- input: "$(params.mas_app_channel_aibroker)"
|
|
22896
|
+
operator: notin
|
|
22897
|
+
values: [""]
|
|
22898
|
+
runAfter:
|
|
22899
|
+
- suite-verify
|
|
22900
|
+
|
|
22901
|
+
# 14.2 Install Kmodels
|
|
22902
|
+
- name: kmodels
|
|
22903
|
+
params:
|
|
22904
|
+
# Controls the image pull policy for the ibmmas/cli image
|
|
22905
|
+
- name: image_pull_policy
|
|
22906
|
+
value: $(params.image_pull_policy)
|
|
22907
|
+
|
|
22908
|
+
- name: devops_suite_name
|
|
22909
|
+
value: kmodels
|
|
22910
|
+
- name: mas_instance_id
|
|
22911
|
+
value: $(params.mas_instance_id)
|
|
22912
|
+
- name: mas_app_id
|
|
22913
|
+
value: aibroker
|
|
22914
|
+
- name: artifactory_username
|
|
22915
|
+
value: $(params.artifactory_username)
|
|
22916
|
+
- name: artifactory_token
|
|
22917
|
+
value: $(params.artifactory_token)
|
|
22918
|
+
- name: mas_app_channel
|
|
22919
|
+
value: "$(params.mas_app_channel_aibroker)"
|
|
22920
|
+
- name: ibm_entitlement_key
|
|
22921
|
+
value: $(params.ibm_entitlement_key)
|
|
22922
|
+
- name: custom_labels
|
|
22923
|
+
value: $(params.custom_labels)
|
|
22924
|
+
- name: mas_aibroker_storage_provider
|
|
22925
|
+
value: $(params.mas_aibroker_storage_provider)
|
|
22926
|
+
- name: mas_aibroker_storage_accesskey
|
|
22927
|
+
value: $(params.mas_aibroker_storage_accesskey)
|
|
22928
|
+
- name: mas_aibroker_storage_secretkey
|
|
22929
|
+
value: $(params.mas_aibroker_storage_secretkey)
|
|
22930
|
+
- name: mas_aibroker_storage_host
|
|
22931
|
+
value: $(params.mas_aibroker_storage_host)
|
|
22932
|
+
- name: mas_aibroker_storage_port
|
|
22933
|
+
value: $(params.mas_aibroker_storage_port)
|
|
22934
|
+
- name: mas_aibroker_storage_ssl
|
|
22935
|
+
value: $(params.mas_aibroker_storage_ssl)
|
|
22936
|
+
- name: mas_aibroker_storage_region
|
|
22937
|
+
value: $(params.mas_aibroker_storage_region)
|
|
22938
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
22939
|
+
value: $(params.mas_aibroker_storage_pipelines_bucket)
|
|
22940
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
22941
|
+
value: $(params.mas_aibroker_storage_tenants_bucket)
|
|
22942
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
22943
|
+
value: $(params.mas_aibroker_storage_templates_bucket)
|
|
22944
|
+
- name: mas_aibroker_controller_tag
|
|
22945
|
+
value: $(params.mas_aibroker_controller_tag)
|
|
22946
|
+
- name: mas_aibroker_store_tag
|
|
22947
|
+
value: $(params.mas_aibroker_store_tag)
|
|
22948
|
+
- name: mas_aibroker_watcher_tag
|
|
22949
|
+
value: $(params.mas_aibroker_watcher_tag)
|
|
22950
|
+
- name: mas_aibroker_connector_tag
|
|
22951
|
+
value: $(params.mas_aibroker_connector_tag)
|
|
22952
|
+
- name: mas_aibroker_pipeline_steps_tag
|
|
22953
|
+
value: $(params.mas_aibroker_pipeline_steps_tag)
|
|
22954
|
+
- name: mas_aibroker_tenant_name
|
|
22955
|
+
value: $(params.mas_aibroker_tenant_name)
|
|
22956
|
+
|
|
22957
|
+
taskRef:
|
|
22958
|
+
name: mas-devops-kmodels
|
|
22959
|
+
kind: Task
|
|
22960
|
+
when:
|
|
22961
|
+
- input: "$(params.mas_app_channel_aibroker)"
|
|
22962
|
+
operator: notin
|
|
22963
|
+
values: [""]
|
|
22964
|
+
runAfter:
|
|
22965
|
+
- odh
|
|
22966
|
+
|
|
22967
|
+
# 14.3 Install Aibroker app
|
|
22968
|
+
- name: app-install-aibroker
|
|
22969
|
+
timeout: "0"
|
|
22970
|
+
params:
|
|
22971
|
+
# Controls the image pull policy for the ibmmas/cli image
|
|
22972
|
+
- name: image_pull_policy
|
|
22973
|
+
value: $(params.image_pull_policy)
|
|
22974
|
+
|
|
22975
|
+
- name: devops_suite_name
|
|
22976
|
+
value: app-aibroker-install
|
|
22977
|
+
|
|
22978
|
+
- name: mas_instance_id
|
|
22979
|
+
value: $(params.mas_instance_id)
|
|
22980
|
+
- name: mas_app_id
|
|
22981
|
+
value: aibroker
|
|
22982
|
+
- name: artifactory_username
|
|
22983
|
+
value: $(params.artifactory_username)
|
|
22984
|
+
- name: artifactory_token
|
|
22985
|
+
value: $(params.artifactory_token)
|
|
22986
|
+
- name: mas_app_channel
|
|
22987
|
+
value: "$(params.mas_app_channel_aibroker)"
|
|
22988
|
+
- name: ibm_entitlement_key
|
|
22989
|
+
value: $(params.ibm_entitlement_key)
|
|
22990
|
+
- name: custom_labels
|
|
22991
|
+
value: $(params.custom_labels)
|
|
22992
|
+
taskRef:
|
|
22993
|
+
name: mas-devops-suite-app-install
|
|
22994
|
+
kind: Task
|
|
22995
|
+
# Only install aibroker if a channel has been chosen
|
|
22996
|
+
when:
|
|
22997
|
+
- input: "$(params.mas_app_channel_aibroker)"
|
|
22998
|
+
operator: notin
|
|
22999
|
+
values: [""]
|
|
23000
|
+
runAfter:
|
|
23001
|
+
- kmodels
|
|
23002
|
+
|
|
23003
|
+
# 14.4 Configure Aibroker
|
|
23004
|
+
- name: aibroker
|
|
23005
|
+
timeout: "0"
|
|
23006
|
+
params:
|
|
23007
|
+
# Controls the image pull policy for the ibmmas/cli image
|
|
23008
|
+
- name: image_pull_policy
|
|
23009
|
+
value: $(params.image_pull_policy)
|
|
23010
|
+
|
|
23011
|
+
- name: devops_suite_name
|
|
23012
|
+
value: aibroker
|
|
23013
|
+
- name: mas_instance_id
|
|
23014
|
+
value: $(params.mas_instance_id)
|
|
23015
|
+
- name: mas_app_id
|
|
23016
|
+
value: aibroker
|
|
23017
|
+
- name: artifactory_username
|
|
23018
|
+
value: $(params.artifactory_username)
|
|
23019
|
+
- name: artifactory_token
|
|
23020
|
+
value: $(params.artifactory_token)
|
|
23021
|
+
- name: mas_app_channel
|
|
23022
|
+
value: "$(params.mas_app_channel_aibroker)"
|
|
23023
|
+
- name: ibm_entitlement_key
|
|
23024
|
+
value: $(params.ibm_entitlement_key)
|
|
23025
|
+
- name: custom_labels
|
|
23026
|
+
value: $(params.custom_labels)
|
|
23027
|
+
- name: mas_aibroker_storage_provider
|
|
23028
|
+
value: $(params.mas_aibroker_storage_provider)
|
|
23029
|
+
- name: mas_aibroker_storage_accesskey
|
|
23030
|
+
value: $(params.mas_aibroker_storage_accesskey)
|
|
23031
|
+
- name: mas_aibroker_storage_secretkey
|
|
23032
|
+
value: $(params.mas_aibroker_storage_secretkey)
|
|
23033
|
+
- name: mas_aibroker_storage_host
|
|
23034
|
+
value: $(params.mas_aibroker_storage_host)
|
|
23035
|
+
- name: mas_aibroker_storage_port
|
|
23036
|
+
value: $(params.mas_aibroker_storage_port)
|
|
23037
|
+
- name: mas_aibroker_storage_ssl
|
|
23038
|
+
value: $(params.mas_aibroker_storage_ssl)
|
|
23039
|
+
- name: mas_aibroker_storage_region
|
|
23040
|
+
value: $(params.mas_aibroker_storage_region)
|
|
23041
|
+
- name: mas_aibroker_storage_pipelines_bucket
|
|
23042
|
+
value: $(params.mas_aibroker_storage_pipelines_bucket)
|
|
23043
|
+
- name: mas_aibroker_storage_tenants_bucket
|
|
23044
|
+
value: $(params.mas_aibroker_storage_tenants_bucket)
|
|
23045
|
+
- name: mas_aibroker_storage_templates_bucket
|
|
23046
|
+
value: $(params.mas_aibroker_storage_templates_bucket)
|
|
23047
|
+
- name: mas_aibroker_watsonxai_apikey
|
|
23048
|
+
value: $(params.mas_aibroker_watsonxai_apikey)
|
|
23049
|
+
- name: mas_aibroker_watsonxai_url
|
|
23050
|
+
value: $(params.mas_aibroker_watsonxai_url)
|
|
23051
|
+
- name: mas_aibroker_watsonxai_project_id
|
|
23052
|
+
value: $(params.mas_aibroker_watsonxai_project_id)
|
|
23053
|
+
- name: mas_aibroker_watsonx_action
|
|
23054
|
+
value: $(params.mas_aibroker_watsonx_action)
|
|
23055
|
+
- name: mas_aibroker_s3_action
|
|
23056
|
+
value: $(params.mas_aibroker_s3_action)
|
|
23057
|
+
- name: mas_aibroker_apikey_action
|
|
23058
|
+
value: $(params.mas_aibroker_apikey_action)
|
|
23059
|
+
- name: mas_aibroker_tenant_name
|
|
23060
|
+
value: $(params.mas_aibroker_tenant_name)
|
|
23061
|
+
taskRef:
|
|
23062
|
+
name: mas-devops-aibroker
|
|
23063
|
+
kind: Task
|
|
23064
|
+
when:
|
|
23065
|
+
- input: "$(params.mas_app_channel_aibroker)"
|
|
23066
|
+
operator: notin
|
|
23067
|
+
values: [""]
|
|
23068
|
+
|
|
23069
|
+
runAfter:
|
|
23070
|
+
- app-install-aibroker
|
|
23071
|
+
|
|
21517
23072
|
finally:
|
|
21518
23073
|
# Update synchronization configmap
|
|
21519
23074
|
# -------------------------------------------------------------------------
|
|
@@ -23192,6 +24747,11 @@ spec:
|
|
|
23192
24747
|
type: string
|
|
23193
24748
|
description: Subscription channel for MVI application operator
|
|
23194
24749
|
default: ""
|
|
24750
|
+
# - name: mas_app_channel_aibroker
|
|
24751
|
+
# type: string
|
|
24752
|
+
# description: Subscription channel for AI Broker application operator
|
|
24753
|
+
# default: ""
|
|
24754
|
+
|
|
23195
24755
|
|
|
23196
24756
|
tasks:
|
|
23197
24757
|
|