mas-cli 11.5.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.

@@ -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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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.5.0
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
- --cloud-provider $CLOUD_PROVIDER \
3290
- --aws-region $SM_AWS_REGION \
3291
- --aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
3292
- --aws-access-key $SM_AWS_ACCESS_KEY_ID
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.5.0
3566
+ image: quay.io/ibmmas/cli:11.6.0
3301
3567
  workspaces:
3302
3568
  - name: configs
3303
3569
 
@@ -3407,7 +3673,7 @@ spec:
3407
3673
  - -c
3408
3674
  name: gitops-deprovision-kafka
3409
3675
  imagePullPolicy: IfNotPresent
3410
- image: quay.io/ibmmas/cli:11.5.0
3676
+ image: quay.io/ibmmas/cli:11.6.0
3411
3677
  workspaces:
3412
3678
  - name: configs
3413
3679
  # --------------------------------------------------------------------------------
@@ -3510,7 +3776,7 @@ spec:
3510
3776
  - -c
3511
3777
  name: gitops-deprovision-mongo
3512
3778
  imagePullPolicy: IfNotPresent
3513
- image: quay.io/ibmmas/cli:11.5.0
3779
+ image: quay.io/ibmmas/cli:11.6.0
3514
3780
  workspaces:
3515
3781
  - name: configs
3516
3782
 
@@ -3567,7 +3833,7 @@ spec:
3567
3833
  - -c
3568
3834
  name: gitops-deprovision-rosa
3569
3835
  imagePullPolicy: IfNotPresent
3570
- image: quay.io/ibmmas/cli:11.5.0
3836
+ image: quay.io/ibmmas/cli:11.6.0
3571
3837
  workspaces:
3572
3838
  - name: configs
3573
3839
  # --------------------------------------------------------------------------------
@@ -3772,7 +4038,7 @@ spec:
3772
4038
  - -c
3773
4039
  name: gitops-deprovision-suite-config
3774
4040
  imagePullPolicy: IfNotPresent
3775
- image: quay.io/ibmmas/cli:11.5.0
4041
+ image: quay.io/ibmmas/cli:11.6.0
3776
4042
  workspaces:
3777
4043
  - name: configs
3778
4044
 
@@ -3870,7 +4136,7 @@ spec:
3870
4136
  - -c
3871
4137
  name: gitops-deprovision-suite-idp-config
3872
4138
  imagePullPolicy: IfNotPresent
3873
- image: quay.io/ibmmas/cli:11.5.0
4139
+ image: quay.io/ibmmas/cli:11.6.0
3874
4140
  workspaces:
3875
4141
  - name: configs
3876
4142
  # --------------------------------------------------------------------------------
@@ -3962,7 +4228,7 @@ spec:
3962
4228
  - -c
3963
4229
  name: gitops-deprovision-suite-objectstorage-config
3964
4230
  imagePullPolicy: IfNotPresent
3965
- image: quay.io/ibmmas/cli:11.5.0
4231
+ image: quay.io/ibmmas/cli:11.6.0
3966
4232
  workspaces:
3967
4233
  - name: configs
3968
4234
  # --------------------------------------------------------------------------------
@@ -4054,7 +4320,7 @@ spec:
4054
4320
  - -c
4055
4321
  name: gitops-deprovision-suite-smtp-config
4056
4322
  imagePullPolicy: IfNotPresent
4057
- image: quay.io/ibmmas/cli:11.5.0
4323
+ image: quay.io/ibmmas/cli:11.6.0
4058
4324
  workspaces:
4059
4325
  - name: configs
4060
4326
  # --------------------------------------------------------------------------------
@@ -4147,7 +4413,7 @@ spec:
4147
4413
  - -c
4148
4414
  name: gitops-deprovision-suite-watson-studio-config
4149
4415
  imagePullPolicy: IfNotPresent
4150
- image: quay.io/ibmmas/cli:11.5.0
4416
+ image: quay.io/ibmmas/cli:11.6.0
4151
4417
  workspaces:
4152
4418
  - name: configs
4153
4419
  # --------------------------------------------------------------------------------
@@ -4238,7 +4504,7 @@ spec:
4238
4504
  - -c
4239
4505
  name: gitops-deprovision-suite-workspace
4240
4506
  imagePullPolicy: Always
4241
- image: quay.io/ibmmas/cli:11.5.0
4507
+ image: quay.io/ibmmas/cli:11.6.0
4242
4508
  workspaces:
4243
4509
  - name: configs
4244
4510
  # --------------------------------------------------------------------------------
@@ -4331,7 +4597,7 @@ spec:
4331
4597
  - -c
4332
4598
  name: gitops-deprovision-suite
4333
4599
  imagePullPolicy: IfNotPresent
4334
- image: quay.io/ibmmas/cli:11.5.0
4600
+ image: quay.io/ibmmas/cli:11.6.0
4335
4601
  workspaces:
4336
4602
  - name: configs
4337
4603
 
@@ -4444,7 +4710,7 @@ spec:
4444
4710
  - -c
4445
4711
  name: gitops-dro
4446
4712
  imagePullPolicy: IfNotPresent
4447
- image: quay.io/ibmmas/cli:11.5.0
4713
+ image: quay.io/ibmmas/cli:11.6.0
4448
4714
  workspaces:
4449
4715
  - name: configs
4450
4716
  # --------------------------------------------------------------------------------
@@ -4514,19 +4780,54 @@ spec:
4514
4780
  echo "Set k8s context"
4515
4781
  export K8S_AUTH_CONTEXT=$(oc whoami -c)
4516
4782
 
4783
+ # Original shared EFS instance
4517
4784
  mas gitops-efs -c $CLUSTER_NAME -m $MAS_INSTANCE_ID \
4518
- --cloud-provider $CLOUD_PROVIDER \
4519
- --aws-region $SM_AWS_REGION \
4520
- --aws-secret-key $SM_AWS_SECRET_ACCESS_KEY \
4521
- --aws-access-key $SM_AWS_ACCESS_KEY_ID
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
4522
4824
 
4523
- exit $?
4524
4825
  command:
4525
4826
  - /bin/sh
4526
4827
  - -c
4527
4828
  name: gitops-efs
4528
4829
  imagePullPolicy: IfNotPresent
4529
- image: quay.io/ibmmas/cli:11.5.0
4830
+ image: quay.io/ibmmas/cli:11.6.0
4530
4831
  workspaces:
4531
4832
  - name: configs
4532
4833
 
@@ -4661,7 +4962,7 @@ spec:
4661
4962
  - -c
4662
4963
  name: gitops-jdbc-config
4663
4964
  imagePullPolicy: Always
4664
- image: quay.io/ibmmas/cli:11.5.0
4965
+ image: quay.io/ibmmas/cli:11.6.0
4665
4966
  workspaces:
4666
4967
  - name: configs
4667
4968
  - name: shared-gitops-configs
@@ -4757,7 +5058,7 @@ spec:
4757
5058
  - -c
4758
5059
  name: gitops-kafka-config
4759
5060
  imagePullPolicy: Always
4760
- image: quay.io/ibmmas/cli:11.5.0
5061
+ image: quay.io/ibmmas/cli:11.6.0
4761
5062
  workspaces:
4762
5063
  - name: configs
4763
5064
 
@@ -4879,7 +5180,7 @@ spec:
4879
5180
  - -c
4880
5181
  name: gitops-kafka
4881
5182
  imagePullPolicy: IfNotPresent
4882
- image: quay.io/ibmmas/cli:11.5.0
5183
+ image: quay.io/ibmmas/cli:11.6.0
4883
5184
  workspaces:
4884
5185
  - name: configs
4885
5186
  # --------------------------------------------------------------------------------
@@ -4930,7 +5231,7 @@ spec:
4930
5231
  - -c
4931
5232
  name: gitops-license
4932
5233
  imagePullPolicy: Always
4933
- image: quay.io/ibmmas/cli:11.5.0
5234
+ image: quay.io/ibmmas/cli:11.6.0
4934
5235
  workspaces:
4935
5236
  - name: shared-entitlement
4936
5237
 
@@ -5433,7 +5734,7 @@ spec:
5433
5734
  - -c
5434
5735
  name: gitops-mas-fvt-preparer
5435
5736
  imagePullPolicy: Always
5436
- image: quay.io/ibmmas/cli:11.5.0
5737
+ image: quay.io/ibmmas/cli:11.6.0
5437
5738
  workspaces:
5438
5739
  - name: configs
5439
5740
  - name: shared-additional-configs
@@ -5875,7 +6176,7 @@ spec:
5875
6176
  - -c
5876
6177
  name: gitops-mas-initiator
5877
6178
  imagePullPolicy: IfNotPresent
5878
- image: quay.io/ibmmas/cli:11.5.0
6179
+ image: quay.io/ibmmas/cli:11.6.0
5879
6180
  workspaces:
5880
6181
  - name: configs
5881
6182
  # --------------------------------------------------------------------------------
@@ -5983,7 +6284,7 @@ spec:
5983
6284
  - -c
5984
6285
  name: gitops-mongo
5985
6286
  imagePullPolicy: IfNotPresent
5986
- image: quay.io/ibmmas/cli:11.5.0
6287
+ image: quay.io/ibmmas/cli:11.6.0
5987
6288
  workspaces:
5988
6289
  - name: configs
5989
6290
 
@@ -6105,7 +6406,7 @@ spec:
6105
6406
  - -c
6106
6407
  name: gitops-nvidia-gpu
6107
6408
  imagePullPolicy: IfNotPresent
6108
- image: quay.io/ibmmas/cli:11.5.0
6409
+ image: quay.io/ibmmas/cli:11.6.0
6109
6410
  workspaces:
6110
6411
  - name: configs
6111
6412
  # --------------------------------------------------------------------------------
@@ -6223,7 +6524,7 @@ spec:
6223
6524
  - -c
6224
6525
  name: gitops-process-mongo-user
6225
6526
  imagePullPolicy: IfNotPresent
6226
- image: quay.io/ibmmas/cli:11.5.0
6527
+ image: quay.io/ibmmas/cli:11.6.0
6227
6528
  workspaces:
6228
6529
  - name: configs
6229
6530
  # --------------------------------------------------------------------------------
@@ -6279,7 +6580,7 @@ spec:
6279
6580
  - -c
6280
6581
  name: gitops-rosa
6281
6582
  imagePullPolicy: IfNotPresent
6282
- image: quay.io/ibmmas/cli:11.5.0
6583
+ image: quay.io/ibmmas/cli:11.6.0
6283
6584
  workspaces:
6284
6585
  - name: configs
6285
6586
  # --------------------------------------------------------------------------------
@@ -6461,7 +6762,7 @@ spec:
6461
6762
  - -c
6462
6763
  name: gitops-suite-app-config
6463
6764
  imagePullPolicy: IfNotPresent
6464
- image: quay.io/ibmmas/cli:11.5.0
6765
+ image: quay.io/ibmmas/cli:11.6.0
6465
6766
  workspaces:
6466
6767
  - name: configs
6467
6768
  - name: shared-gitops-configs
@@ -6619,7 +6920,7 @@ spec:
6619
6920
  - -c
6620
6921
  name: gitops-suite-app-install
6621
6922
  imagePullPolicy: Always
6622
- image: quay.io/ibmmas/cli:11.5.0
6923
+ image: quay.io/ibmmas/cli:11.6.0
6623
6924
  workspaces:
6624
6925
  - name: configs
6625
6926
  - name: shared-gitops-configs
@@ -6725,7 +7026,7 @@ spec:
6725
7026
  - -c
6726
7027
  name: gitops-suite-certs
6727
7028
  imagePullPolicy: IfNotPresent
6728
- image: quay.io/ibmmas/cli:11.5.0
7029
+ image: quay.io/ibmmas/cli:11.6.0
6729
7030
  workspaces:
6730
7031
  - name: configs
6731
7032
  - name: certificates
@@ -6885,7 +7186,7 @@ spec:
6885
7186
  - -c
6886
7187
  name: gitops-suite-config
6887
7188
  imagePullPolicy: IfNotPresent
6888
- image: quay.io/ibmmas/cli:11.5.0
7189
+ image: quay.io/ibmmas/cli:11.6.0
6889
7190
  workspaces:
6890
7191
  - name: configs
6891
7192
  - name: shared-additional-configs
@@ -6985,7 +7286,7 @@ spec:
6985
7286
  - -c
6986
7287
  name: gitops-suite-dns
6987
7288
  imagePullPolicy: IfNotPresent
6988
- image: quay.io/ibmmas/cli:11.5.0
7289
+ image: quay.io/ibmmas/cli:11.6.0
6989
7290
  workspaces:
6990
7291
  - name: configs
6991
7292
 
@@ -7109,7 +7410,7 @@ spec:
7109
7410
  - -c
7110
7411
  name: gitops-suite-idp-config
7111
7412
  imagePullPolicy: IfNotPresent
7112
- image: quay.io/ibmmas/cli:11.5.0
7413
+ image: quay.io/ibmmas/cli:11.6.0
7113
7414
  workspaces:
7114
7415
  - name: configs
7115
7416
  - name: shared-additional-configs
@@ -7210,7 +7511,7 @@ spec:
7210
7511
  - -c
7211
7512
  name: gitops-suite-objectstorage-config
7212
7513
  imagePullPolicy: IfNotPresent
7213
- image: quay.io/ibmmas/cli:11.5.0
7514
+ image: quay.io/ibmmas/cli:11.6.0
7214
7515
  workspaces:
7215
7516
  - name: configs
7216
7517
  - name: shared-gitops-configs
@@ -7346,7 +7647,7 @@ spec:
7346
7647
  - -c
7347
7648
  name: gitops-suite-smtp-config
7348
7649
  imagePullPolicy: IfNotPresent
7349
- image: quay.io/ibmmas/cli:11.5.0
7650
+ image: quay.io/ibmmas/cli:11.6.0
7350
7651
  workspaces:
7351
7652
  - name: configs
7352
7653
 
@@ -7455,7 +7756,7 @@ spec:
7455
7756
  - -c
7456
7757
  name: gitops-suite-watson-studio-config
7457
7758
  imagePullPolicy: IfNotPresent
7458
- image: quay.io/ibmmas/cli:11.5.0
7759
+ image: quay.io/ibmmas/cli:11.6.0
7459
7760
  workspaces:
7460
7761
  - name: configs
7461
7762
  - name: shared-gitops-configs
@@ -7552,7 +7853,7 @@ spec:
7552
7853
  - -c
7553
7854
  name: gitops-suite-workspace
7554
7855
  imagePullPolicy: IfNotPresent
7555
- image: quay.io/ibmmas/cli:11.5.0
7856
+ image: quay.io/ibmmas/cli:11.6.0
7556
7857
  workspaces:
7557
7858
  - name: configs
7558
7859
  # --------------------------------------------------------------------------------
@@ -7832,7 +8133,7 @@ spec:
7832
8133
  - -c
7833
8134
  name: gitops-suite
7834
8135
  imagePullPolicy: IfNotPresent
7835
- image: quay.io/ibmmas/cli:11.5.0
8136
+ image: quay.io/ibmmas/cli:11.6.0
7836
8137
  workspaces:
7837
8138
  - name: configs
7838
8139
  - name: shared-gitops-configs
@@ -7882,7 +8183,7 @@ spec:
7882
8183
 
7883
8184
  steps:
7884
8185
  - name: grafana
7885
- image: quay.io/ibmmas/cli:11.5.0
8186
+ image: quay.io/ibmmas/cli:11.6.0
7886
8187
  imagePullPolicy: $(params.image_pull_policy)
7887
8188
  command:
7888
8189
  - /opt/app-root/src/run-role.sh
@@ -8016,7 +8317,7 @@ spec:
8016
8317
  command:
8017
8318
  - /opt/app-root/src/run-role.sh
8018
8319
  - ibm_catalogs
8019
- image: quay.io/ibmmas/cli:11.5.0
8320
+ image: quay.io/ibmmas/cli:11.6.0
8020
8321
  imagePullPolicy: $(params.image_pull_policy)
8021
8322
  workingDir: /workspace/configs
8022
8323
  # --------------------------------------------------------------------------------
@@ -8258,7 +8559,7 @@ spec:
8258
8559
  command:
8259
8560
  - /opt/app-root/src/run-role.sh
8260
8561
  - kafka
8261
- image: quay.io/ibmmas/cli:11.5.0
8562
+ image: quay.io/ibmmas/cli:11.6.0
8262
8563
  imagePullPolicy: $(params.image_pull_policy)
8263
8564
  workingDir: /workspace/configs
8264
8565
 
@@ -8266,6 +8567,217 @@ spec:
8266
8567
  - name: configs
8267
8568
  optional: true
8268
8569
  # --------------------------------------------------------------------------------
8570
+ # /home/runner/work/cli/cli/tekton/target/tasks/kmodels.yaml
8571
+ # --------------------------------------------------------------------------------
8572
+ ---
8573
+ apiVersion: tekton.dev/v1beta1
8574
+ kind: Task
8575
+ metadata:
8576
+ name: mas-devops-kmodels
8577
+ spec:
8578
+ params:
8579
+ # Common: Control the image pull policy for the CLI container image
8580
+ - name: image_pull_policy
8581
+ type: string
8582
+ default: IfNotPresent
8583
+
8584
+ # Common: Support for saving task execution results to a MongoDb instance
8585
+ - name: devops_suite_name
8586
+ type: string
8587
+ description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
8588
+ default: ""
8589
+
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
8606
+ - name: mas_instance_id
8607
+ type: string
8608
+ description: Instance ID
8609
+
8610
+ # Application - Operator
8611
+ # - name: mas_aibroker_channel
8612
+ - name: mas_app_channel
8613
+ type: string
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
8623
+ default: ""
8624
+
8625
+ # Custom Label Support
8626
+ - name: custom_labels
8627
+ type: string
8628
+ description: Optional MAS custom labels, comma separated list of key=value pairs
8629
+ default: ""
8630
+
8631
+ # Kmodels details
8632
+ - name: mas_aibroker_controller_tag
8633
+ type: string
8634
+ description: Optional Kmodels details
8635
+ default: ""
8636
+ - name: mas_aibroker_store_tag
8637
+ type: string
8638
+ description: Optional Kmodels details
8639
+ default: ""
8640
+ - name: mas_aibroker_watcher_tag
8641
+ type: string
8642
+ description: Optional Kmodels details
8643
+ default: ""
8644
+ - name: mas_aibroker_connector_tag
8645
+ type: string
8646
+ description: Optional Kmodels details
8647
+ default: ""
8648
+ - name: mas_aibroker_pipeline_steps_tag
8649
+ type: string
8650
+ description: Optional Kmodels details
8651
+ default: ""
8652
+ - name: mas_aibroker_storage_pipelines_bucket
8653
+ type: string
8654
+ description: This option is mandatory
8655
+ default: ""
8656
+ - name: mas_aibroker_storage_tenants_bucket
8657
+ type: string
8658
+ description: This option is mandatory
8659
+ default: ""
8660
+ - name: mas_aibroker_storage_templates_bucket
8661
+ type: string
8662
+ description: This option is mandatory
8663
+ default: ""
8664
+ - name: mas_aibroker_storage_provider
8665
+ type: string
8666
+ default: "This option is mandatory"
8667
+ default: ""
8668
+ - name: mas_aibroker_storage_accesskey
8669
+ type: string
8670
+ default: "This option is mandatory"
8671
+ default: ""
8672
+ - name: mas_aibroker_storage_secretkey
8673
+ type: string
8674
+ default: "This option is mandatory"
8675
+ default: ""
8676
+ - name: mas_aibroker_storage_host
8677
+ type: string
8678
+ default: "This option is mandatory"
8679
+ default: ""
8680
+ - name: mas_aibroker_storage_port
8681
+ type: string
8682
+ default: "This option is mandatory"
8683
+ default: ""
8684
+ - name: mas_aibroker_storage_ssl
8685
+ type: string
8686
+ default: "This option is mandatory"
8687
+ default: ""
8688
+ - name: mas_aibroker_storage_region
8689
+ type: string
8690
+ default: "This option is mandatory"
8691
+ default: ""
8692
+
8693
+ stepTemplate:
8694
+ env:
8695
+ - name: DEVOPS_MONGO_URI
8696
+ valueFrom:
8697
+ secretKeyRef:
8698
+ name: mas-devops
8699
+ key: DEVOPS_MONGO_URI
8700
+ optional: true
8701
+ - name: DEVOPS_BUILD_NUMBER
8702
+ valueFrom:
8703
+ secretKeyRef:
8704
+ name: mas-devops
8705
+ key: DEVOPS_BUILD_NUMBER
8706
+ optional: true
8707
+ - name: DEVOPS_ENVIRONMENT
8708
+ valueFrom:
8709
+ secretKeyRef:
8710
+ name: mas-devops
8711
+ key: MAS_INSTANCE_ID
8712
+ optional: true
8713
+ - name: DEVOPS_SUITE_NAME
8714
+ value: $(params.devops_suite_name)
8715
+
8716
+
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
+ # --------------------------------------------------------------------------------
8269
8781
  # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
8270
8782
  # --------------------------------------------------------------------------------
8271
8783
  ---
@@ -8441,7 +8953,7 @@ spec:
8441
8953
  command:
8442
8954
  - /opt/app-root/src/run-role.sh
8443
8955
  - mongodb
8444
- image: quay.io/ibmmas/cli:11.5.0
8956
+ image: quay.io/ibmmas/cli:11.6.0
8445
8957
  imagePullPolicy: $(params.image_pull_policy)
8446
8958
  workingDir: /workspace/configs
8447
8959
 
@@ -8484,7 +8996,7 @@ spec:
8484
8996
  - $(params.base_output_dir)
8485
8997
  - --extra-namespaces
8486
8998
  - selenium
8487
- image: quay.io/ibmmas/cli:11.5.0
8999
+ image: quay.io/ibmmas/cli:11.6.0
8488
9000
  imagePullPolicy: $(params.image_pull_policy)
8489
9001
  env:
8490
9002
  - name: DEVOPS_MONGO_URI
@@ -8601,7 +9113,7 @@ spec:
8601
9113
  command:
8602
9114
  - /opt/app-root/src/run-role.sh
8603
9115
  - nvidia_gpu
8604
- image: quay.io/ibmmas/cli:11.5.0
9116
+ image: quay.io/ibmmas/cli:11.6.0
8605
9117
  imagePullPolicy: $(params.image_pull_policy)
8606
9118
  workingDir: /workspace/configs
8607
9119
 
@@ -8637,7 +9149,7 @@ spec:
8637
9149
  # Verify Cluster
8638
9150
  # -------------------------------------------------------------------------
8639
9151
  - name: ocp-verify-cluster
8640
- image: quay.io/ibmmas/cli:11.5.0
9152
+ image: quay.io/ibmmas/cli:11.6.0
8641
9153
  imagePullPolicy: $(params.image_pull_policy)
8642
9154
  command:
8643
9155
  - /opt/app-root/src/run-role.sh
@@ -8679,7 +9191,7 @@ spec:
8679
9191
  # Verify Catalogs
8680
9192
  # -------------------------------------------------------------------------
8681
9193
  - name: ocp-verify-catalogs
8682
- image: quay.io/ibmmas/cli:11.5.0
9194
+ image: quay.io/ibmmas/cli:11.6.0
8683
9195
  imagePullPolicy: $(params.image_pull_policy)
8684
9196
  command:
8685
9197
  - /opt/app-root/src/run-role.sh
@@ -8721,7 +9233,7 @@ spec:
8721
9233
  # Verify Subscriptions
8722
9234
  # -------------------------------------------------------------------------
8723
9235
  - name: ocp-verify-subscriptions
8724
- image: quay.io/ibmmas/cli:11.5.0
9236
+ image: quay.io/ibmmas/cli:11.6.0
8725
9237
  imagePullPolicy: $(params.image_pull_policy)
8726
9238
  command:
8727
9239
  - /opt/app-root/src/run-role.sh
@@ -8763,7 +9275,7 @@ spec:
8763
9275
  # Verify Workloads
8764
9276
  # -------------------------------------------------------------------------
8765
9277
  - name: ocp-verify-workloads
8766
- image: quay.io/ibmmas/cli:11.5.0
9278
+ image: quay.io/ibmmas/cli:11.6.0
8767
9279
  imagePullPolicy: $(params.image_pull_policy)
8768
9280
  command:
8769
9281
  - /opt/app-root/src/run-role.sh
@@ -8805,7 +9317,7 @@ spec:
8805
9317
  # Verify Catalogs - Ingress TLS
8806
9318
  # -------------------------------------------------------------------------
8807
9319
  - name: ocp-verify-ingress
8808
- image: quay.io/ibmmas/cli:11.5.0
9320
+ image: quay.io/ibmmas/cli:11.6.0
8809
9321
  imagePullPolicy: $(params.image_pull_policy)
8810
9322
  command:
8811
9323
  - /opt/app-root/src/run-role.sh
@@ -8931,7 +9443,7 @@ spec:
8931
9443
  command:
8932
9444
  - /opt/app-root/src/run-role.sh
8933
9445
  - ocp_verify
8934
- image: quay.io/ibmmas/cli:11.5.0
9446
+ image: quay.io/ibmmas/cli:11.6.0
8935
9447
  imagePullPolicy: $(params.image_pull_policy)
8936
9448
  workingDir: /workspace/configs
8937
9449
  # --------------------------------------------------------------------------------
@@ -8947,22 +9459,199 @@ spec:
8947
9459
  # Common: Control the image pull policy for the CLI container image
8948
9460
  - name: image_pull_policy
8949
9461
  type: string
8950
- default: IfNotPresent
8951
-
8952
- # Common: Support for saving task execution results to a MongoDb instance
8953
- - name: devops_suite_name
9462
+ default: IfNotPresent
9463
+
9464
+ # Common: Support for saving task execution results to a MongoDb instance
9465
+ - name: devops_suite_name
9466
+ type: string
9467
+ description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
9468
+ default: ""
9469
+
9470
+
9471
+ - name: ocs_action
9472
+ type: string
9473
+ description: Optional. Set to 'upgrade' to update ocs/odf storage cluster.
9474
+ default: ""
9475
+ - name: lso_device_path
9476
+ type: string
9477
+ description: Optional. The device path needed for the local volume used by the local storage operator.
9478
+ default: ""
9479
+
9480
+ stepTemplate:
9481
+ env:
9482
+ - name: DEVOPS_MONGO_URI
9483
+ valueFrom:
9484
+ secretKeyRef:
9485
+ name: mas-devops
9486
+ key: DEVOPS_MONGO_URI
9487
+ optional: true
9488
+ - name: DEVOPS_BUILD_NUMBER
9489
+ valueFrom:
9490
+ secretKeyRef:
9491
+ name: mas-devops
9492
+ key: DEVOPS_BUILD_NUMBER
9493
+ optional: true
9494
+ - name: DEVOPS_ENVIRONMENT
9495
+ valueFrom:
9496
+ secretKeyRef:
9497
+ name: mas-devops
9498
+ key: MAS_INSTANCE_ID
9499
+ optional: true
9500
+ - name: DEVOPS_SUITE_NAME
9501
+ value: $(params.devops_suite_name)
9502
+
9503
+
9504
+ - name: OCS_ACTION
9505
+ value: $(params.ocs_action)
9506
+ - name: LSO_DEVICE_PATH
9507
+ value: $(params.lso_device_path)
9508
+
9509
+ steps:
9510
+ - name: ocs
9511
+ command:
9512
+ - /opt/app-root/src/run-role.sh
9513
+ - ocs
9514
+ image: quay.io/ibmmas/cli:11.6.0
9515
+ imagePullPolicy: $(params.image_pull_policy)
9516
+ workingDir: /workspace/configs
9517
+
9518
+ workspaces:
9519
+ - name: configs
9520
+ optional: true
9521
+ # --------------------------------------------------------------------------------
9522
+ # /home/runner/work/cli/cli/tekton/target/tasks/odh.yaml
9523
+ # --------------------------------------------------------------------------------
9524
+ ---
9525
+ apiVersion: tekton.dev/v1beta1
9526
+ kind: Task
9527
+ metadata:
9528
+ name: mas-devops-odh
9529
+ spec:
9530
+ params:
9531
+ # Common: Control the image pull policy for the CLI container image
9532
+ - name: image_pull_policy
9533
+ type: string
9534
+ default: IfNotPresent
9535
+
9536
+ # Common: Support for saving task execution results to a MongoDb instance
9537
+ - name: devops_suite_name
9538
+ type: string
9539
+ description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
9540
+ default: ""
9541
+
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
9558
+ - name: mas_instance_id
9559
+ type: string
9560
+ description: Instance ID
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
8954
9573
  type: string
8955
- description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
9574
+ description: Application installation plan
8956
9575
  default: ""
8957
9576
 
9577
+ # Custom Label Support
9578
+ - name: custom_labels
9579
+ type: string
9580
+ description: Optional MAS custom labels, comma separated list of key=value pairs
9581
+ default: ""
8958
9582
 
8959
- - name: ocs_action
9583
+ # Opendatahub details
9584
+ - name: mas_aibroker_storage_provider
8960
9585
  type: string
8961
- description: Optional. Set to 'upgrade' to update ocs/odf storage cluster.
9586
+ default: "This option is mandatory"
8962
9587
  default: ""
8963
- - name: lso_device_path
9588
+ - name: mas_aibroker_storage_accesskey
8964
9589
  type: string
8965
- description: Optional. The device path needed for the local volume used by the local storage operator.
9590
+ default: "This option is mandatory"
9591
+ default: ""
9592
+ - name: mas_aibroker_storage_secretkey
9593
+ type: string
9594
+ default: "This option is mandatory"
9595
+ default: ""
9596
+ - name: mas_aibroker_storage_host
9597
+ type: string
9598
+ default: "This option is mandatory"
9599
+ default: ""
9600
+ - name: mas_aibroker_storage_port
9601
+ type: string
9602
+ default: "This option is mandatory"
9603
+ default: ""
9604
+ - name: mas_aibroker_storage_ssl
9605
+ type: string
9606
+ default: "This option is mandatory"
9607
+ default: ""
9608
+ - name: mas_aibroker_storage_region
9609
+ type: string
9610
+ default: "This option is mandatory"
9611
+ default: ""
9612
+ - name: mas_aibroker_storage_pipelines_bucket
9613
+ type: string
9614
+ default: "This option is mandatory"
9615
+ default: ""
9616
+ - name: mas_aibroker_storage_tenants_bucket
9617
+ type: string
9618
+ default: "This option is mandatory"
9619
+ default: ""
9620
+ - name: mas_aibroker_storage_templates_bucket
9621
+ type: string
9622
+ default: "This option is mandatory"
9623
+ default: ""
9624
+ - name: mas_aibroker_tenant_name
9625
+ type: string
9626
+ default: "This option is mandatory"
9627
+ default: ""
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"
8966
9655
  default: ""
8967
9656
 
8968
9657
  stepTemplate:
@@ -8989,23 +9678,77 @@ spec:
8989
9678
  value: $(params.devops_suite_name)
8990
9679
 
8991
9680
 
8992
- - name: OCS_ACTION
8993
- value: $(params.ocs_action)
8994
- - name: LSO_DEVICE_PATH
8995
- value: $(params.lso_device_path)
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)
8996
9744
 
8997
9745
  steps:
8998
- - name: ocs
9746
+ - name: odh
8999
9747
  command:
9000
9748
  - /opt/app-root/src/run-role.sh
9001
- - ocs
9002
- image: quay.io/ibmmas/cli:11.5.0
9749
+ - odh
9750
+ image: quay.io/ibmmas/cli:11.6.0
9003
9751
  imagePullPolicy: $(params.image_pull_policy)
9004
- workingDir: /workspace/configs
9005
-
9006
- workspaces:
9007
- - name: configs
9008
- optional: true
9009
9752
  # --------------------------------------------------------------------------------
9010
9753
  # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
9011
9754
  # --------------------------------------------------------------------------------
@@ -9180,7 +9923,7 @@ spec:
9180
9923
  command:
9181
9924
  - /opt/app-root/src/run-role.sh
9182
9925
  - sls
9183
- image: quay.io/ibmmas/cli:11.5.0
9926
+ image: quay.io/ibmmas/cli:11.6.0
9184
9927
  imagePullPolicy: $(params.image_pull_policy)
9185
9928
  workingDir: /workspace/configs
9186
9929
 
@@ -9555,12 +10298,12 @@ spec:
9555
10298
  command:
9556
10299
  - /opt/app-root/src/run-role.sh
9557
10300
  - suite_app_config
9558
- image: quay.io/ibmmas/cli:11.5.0
10301
+ image: quay.io/ibmmas/cli:11.6.0
9559
10302
  imagePullPolicy: $(params.image_pull_policy)
9560
10303
 
9561
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"
9562
10305
  - name: app-cfg-post-verify
9563
- image: quay.io/ibmmas/cli:11.5.0
10306
+ image: quay.io/ibmmas/cli:11.6.0
9564
10307
  imagePullPolicy: $(params.image_pull_policy)
9565
10308
  command:
9566
10309
  - /opt/app-root/src/wait-for-configmap.sh
@@ -9761,7 +10504,7 @@ spec:
9761
10504
  command:
9762
10505
  - /opt/app-root/src/run-role.sh
9763
10506
  - suite_app_install
9764
- image: quay.io/ibmmas/cli:11.5.0
10507
+ image: quay.io/ibmmas/cli:11.6.0
9765
10508
  imagePullPolicy: $(params.image_pull_policy)
9766
10509
 
9767
10510
  workspaces:
@@ -9850,7 +10593,7 @@ spec:
9850
10593
  command:
9851
10594
  - /opt/app-root/src/run-role.sh
9852
10595
  - suite_app_rollback
9853
- image: quay.io/ibmmas/cli:11.5.0
10596
+ image: quay.io/ibmmas/cli:11.6.0
9854
10597
  imagePullPolicy: $(params.image_pull_policy)
9855
10598
  # --------------------------------------------------------------------------------
9856
10599
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -9913,7 +10656,7 @@ spec:
9913
10656
  command:
9914
10657
  - /opt/app-root/src/run-role.sh
9915
10658
  - suite_app_uninstall
9916
- image: quay.io/ibmmas/cli:11.5.0
10659
+ image: quay.io/ibmmas/cli:11.6.0
9917
10660
  imagePullPolicy: $(params.image_pull_policy)
9918
10661
  # --------------------------------------------------------------------------------
9919
10662
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -9988,7 +10731,7 @@ spec:
9988
10731
  command:
9989
10732
  - /opt/app-root/src/run-role.sh
9990
10733
  - suite_app_upgrade
9991
- image: quay.io/ibmmas/cli:11.5.0
10734
+ image: quay.io/ibmmas/cli:11.6.0
9992
10735
  imagePullPolicy: $(params.image_pull_policy)
9993
10736
  # --------------------------------------------------------------------------------
9994
10737
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -10089,7 +10832,7 @@ spec:
10089
10832
  command:
10090
10833
  - /opt/app-root/src/run-role.sh
10091
10834
  - suite_app_verify
10092
- image: quay.io/ibmmas/cli:11.5.0
10835
+ image: quay.io/ibmmas/cli:11.6.0
10093
10836
  imagePullPolicy: $(params.image_pull_policy)
10094
10837
  # --------------------------------------------------------------------------------
10095
10838
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -10232,7 +10975,7 @@ spec:
10232
10975
  command:
10233
10976
  - /opt/app-root/src/run-role.sh
10234
10977
  - suite_certs
10235
- image: quay.io/ibmmas/cli:11.5.0
10978
+ image: quay.io/ibmmas/cli:11.6.0
10236
10979
  imagePullPolicy: $(params.image_pull_policy)
10237
10980
 
10238
10981
  workspaces:
@@ -10299,7 +11042,7 @@ spec:
10299
11042
  command:
10300
11043
  - /opt/app-root/src/run-role.sh
10301
11044
  - suite_config
10302
- image: quay.io/ibmmas/cli:11.5.0
11045
+ image: quay.io/ibmmas/cli:11.6.0
10303
11046
  imagePullPolicy: $(params.image_pull_policy)
10304
11047
  workingDir: /workspace/configs
10305
11048
 
@@ -10370,7 +11113,7 @@ spec:
10370
11113
  command:
10371
11114
  - /opt/app-root/src/run-role.sh
10372
11115
  - suite_db2_setup_for_manage
10373
- image: quay.io/ibmmas/cli:11.5.0
11116
+ image: quay.io/ibmmas/cli:11.6.0
10374
11117
  imagePullPolicy: $(params.image_pull_policy)
10375
11118
  # --------------------------------------------------------------------------------
10376
11119
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -10560,7 +11303,7 @@ spec:
10560
11303
  command:
10561
11304
  - /opt/app-root/src/run-role.sh
10562
11305
  - suite_dns
10563
- image: quay.io/ibmmas/cli:11.5.0
11306
+ image: quay.io/ibmmas/cli:11.6.0
10564
11307
  imagePullPolicy: $(params.image_pull_policy)
10565
11308
  # --------------------------------------------------------------------------------
10566
11309
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -10809,7 +11552,7 @@ spec:
10809
11552
  command:
10810
11553
  - /opt/app-root/src/run-role.sh
10811
11554
  - suite_install
10812
- image: quay.io/ibmmas/cli:11.5.0
11555
+ image: quay.io/ibmmas/cli:11.6.0
10813
11556
  imagePullPolicy: $(params.image_pull_policy)
10814
11557
  workingDir: /workspace/configs
10815
11558
 
@@ -10897,7 +11640,7 @@ spec:
10897
11640
  command:
10898
11641
  - /opt/app-root/src/run-role.sh
10899
11642
  - suite_rollback
10900
- image: quay.io/ibmmas/cli:11.5.0
11643
+ image: quay.io/ibmmas/cli:11.6.0
10901
11644
  imagePullPolicy: $(params.image_pull_policy)
10902
11645
  # --------------------------------------------------------------------------------
10903
11646
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -10962,7 +11705,7 @@ spec:
10962
11705
  command:
10963
11706
  - /opt/app-root/src/run-role.sh
10964
11707
  - suite_uninstall
10965
- image: quay.io/ibmmas/cli:11.5.0
11708
+ image: quay.io/ibmmas/cli:11.6.0
10966
11709
  imagePullPolicy: $(params.image_pull_policy)
10967
11710
  # --------------------------------------------------------------------------------
10968
11711
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -11032,7 +11775,7 @@ spec:
11032
11775
  command:
11033
11776
  - /opt/app-root/src/run-role.sh
11034
11777
  - suite_upgrade
11035
- image: quay.io/ibmmas/cli:11.5.0
11778
+ image: quay.io/ibmmas/cli:11.6.0
11036
11779
  imagePullPolicy: $(params.image_pull_policy)
11037
11780
  # --------------------------------------------------------------------------------
11038
11781
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -11094,12 +11837,12 @@ spec:
11094
11837
  command:
11095
11838
  - /opt/app-root/src/run-role.sh
11096
11839
  - suite_verify
11097
- image: quay.io/ibmmas/cli:11.5.0
11840
+ image: quay.io/ibmmas/cli:11.6.0
11098
11841
  imagePullPolicy: $(params.image_pull_policy)
11099
11842
 
11100
11843
  # If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
11101
11844
  - name: suite-post-verify
11102
- image: quay.io/ibmmas/cli:11.5.0
11845
+ image: quay.io/ibmmas/cli:11.6.0
11103
11846
  imagePullPolicy: $(params.image_pull_policy)
11104
11847
  command:
11105
11848
  - /opt/app-root/src/wait-for-configmap.sh
@@ -11228,7 +11971,7 @@ spec:
11228
11971
  command:
11229
11972
  - /opt/app-root/src/run-role.sh
11230
11973
  - turbonomic
11231
- image: quay.io/ibmmas/cli:11.5.0
11974
+ image: quay.io/ibmmas/cli:11.6.0
11232
11975
  imagePullPolicy: $(params.image_pull_policy)
11233
11976
  # --------------------------------------------------------------------------------
11234
11977
  # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -11309,7 +12052,7 @@ spec:
11309
12052
  # IBM User Data Services (UDS)
11310
12053
  # -------------------------------------------------------------------------
11311
12054
  - name: uds
11312
- image: quay.io/ibmmas/cli:11.5.0
12055
+ image: quay.io/ibmmas/cli:11.6.0
11313
12056
  imagePullPolicy: $(params.image_pull_policy)
11314
12057
  workingDir: /workspace/configs
11315
12058
  command:
@@ -11372,7 +12115,7 @@ spec:
11372
12115
  # IBM Data Reporter Operator (DRO)
11373
12116
  # -------------------------------------------------------------------------
11374
12117
  - name: dro
11375
- image: quay.io/ibmmas/cli:11.5.0
12118
+ image: quay.io/ibmmas/cli:11.6.0
11376
12119
  imagePullPolicy: $(params.image_pull_policy)
11377
12120
  workingDir: /workspace/configs
11378
12121
  command:
@@ -11458,7 +12201,7 @@ spec:
11458
12201
 
11459
12202
  steps:
11460
12203
  - name: update-configmap
11461
- image: quay.io/ibmmas/cli:11.5.0
12204
+ image: quay.io/ibmmas/cli:11.6.0
11462
12205
  command:
11463
12206
  - /opt/app-root/src/update-configmap.sh
11464
12207
  env:
@@ -11520,7 +12263,7 @@ spec:
11520
12263
 
11521
12264
  steps:
11522
12265
  - name: wait-for-configmap
11523
- image: quay.io/ibmmas/cli:11.5.0
12266
+ image: quay.io/ibmmas/cli:11.6.0
11524
12267
  command:
11525
12268
  - /opt/app-root/src/wait-for-configmap.sh
11526
12269
  env:
@@ -11584,7 +12327,7 @@ spec:
11584
12327
 
11585
12328
  steps:
11586
12329
  - name: wait
11587
- image: quay.io/ibmmas/cli:11.5.0
12330
+ image: quay.io/ibmmas/cli:11.6.0
11588
12331
  command:
11589
12332
  - /opt/app-root/src/wait-for-tekton.sh
11590
12333
  env:
@@ -19418,6 +20161,11 @@ spec:
19418
20161
  type: string
19419
20162
  description: Subscription channel for MVI application operator
19420
20163
  default: ""
20164
+ # - name: mas_app_channel_aibroker
20165
+ # type: string
20166
+ # description: Subscription channel for AI Broker application operator
20167
+ # default: ""
20168
+
19421
20169
 
19422
20170
  # MAS Configuration
19423
20171
  # -----------------------------------------------------------------------------
@@ -19684,6 +20432,132 @@ spec:
19684
20432
  description: controls the workload size of predict containers
19685
20433
  default: "small"
19686
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
+
19687
20561
 
19688
20562
  tasks:
19689
20563
  # Content
@@ -20439,7 +21313,7 @@ spec:
20439
21313
  name: mas-devops-cp4d
20440
21314
  # Only needed if either Predict, Assist, Health w/ WSL, or Cognos are being installed
20441
21315
  when:
20442
- - input: "$(params.mas_app_channel_predict)$(params.mas_app_channel_assist)$(params.mas_appws_bindings_health_wsl_flag)$(params.cpd_install_cognos)$(params.cpd_install_all)"
21316
+ - input: "$(params.mas_app_channel_predict)$(params.mas_appws_bindings_health_wsl_flag)$(params.cpd_install_cognos)$(params.cpd_install_all)"
20443
21317
  operator: notin
20444
21318
  values: [""]
20445
21319
  runAfter:
@@ -21951,6 +22825,250 @@ spec:
21951
22825
  - turbonomic
21952
22826
  - cognos
21953
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
+
21954
23072
  finally:
21955
23073
  # Update synchronization configmap
21956
23074
  # -------------------------------------------------------------------------
@@ -23629,6 +24747,11 @@ spec:
23629
24747
  type: string
23630
24748
  description: Subscription channel for MVI application operator
23631
24749
  default: ""
24750
+ # - name: mas_app_channel_aibroker
24751
+ # type: string
24752
+ # description: Subscription channel for AI Broker application operator
24753
+ # default: ""
24754
+
23632
24755
 
23633
24756
  tasks:
23634
24757