mas-cli 13.15.0__py3-none-any.whl → 13.15.2__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 CHANGED
@@ -8,4 +8,4 @@
8
8
  #
9
9
  # *****************************************************************************
10
10
 
11
- __version__ = "13.15.0" # Python module compatible semver
11
+ __version__ = "13.15.2" # Python module compatible semver
mas/cli/cli.py CHANGED
@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
117
117
  logging.getLogger('asyncio').setLevel(logging.INFO)
118
118
 
119
119
  # Supports extended semver, unlike mas.cli.__version__
120
- self.version = "13.15.0"
120
+ self.version = "13.15.2"
121
121
  self.h1count = 0
122
122
  self.h2count = 0
123
123
 
@@ -231,7 +231,7 @@ spec:
231
231
  command:
232
232
  - /opt/app-root/src/run-role.sh
233
233
  - aibroker
234
- image: quay.io/ibmmas/cli:13.15.0
234
+ image: quay.io/ibmmas/cli:13.15.2
235
235
  imagePullPolicy: $(params.image_pull_policy)
236
236
  # --------------------------------------------------------------------------------
237
237
  # /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
@@ -342,7 +342,7 @@ spec:
342
342
  command:
343
343
  - /opt/app-root/src/run-role.sh
344
344
  - appconnect
345
- image: quay.io/ibmmas/cli:13.15.0
345
+ image: quay.io/ibmmas/cli:13.15.2
346
346
  imagePullPolicy: $(params.image_pull_policy)
347
347
  workingDir: /workspace/configs
348
348
 
@@ -460,7 +460,7 @@ spec:
460
460
  command:
461
461
  - /opt/app-root/src/run-role.sh
462
462
  - arcgis
463
- image: quay.io/ibmmas/cli:13.15.0
463
+ image: quay.io/ibmmas/cli:13.15.2
464
464
  imagePullPolicy: $(params.image_pull_policy)
465
465
  # --------------------------------------------------------------------------------
466
466
  # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -530,7 +530,7 @@ spec:
530
530
  command:
531
531
  - /opt/app-root/src/run-role.sh
532
532
  - cert_manager
533
- image: quay.io/ibmmas/cli:13.15.0
533
+ image: quay.io/ibmmas/cli:13.15.2
534
534
  imagePullPolicy: $(params.image_pull_policy)
535
535
  workingDir: /workspace/configs
536
536
  # --------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ spec:
596
596
  command:
597
597
  - /opt/app-root/src/run-role.sh
598
598
  - common_services
599
- image: quay.io/ibmmas/cli:13.15.0
599
+ image: quay.io/ibmmas/cli:13.15.2
600
600
  imagePullPolicy: $(params.image_pull_policy)
601
601
  workingDir: /workspace/configs
602
602
  # --------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ spec:
723
723
  command:
724
724
  - /opt/app-root/src/run-role.sh
725
725
  - cos
726
- image: quay.io/ibmmas/cli:13.15.0
726
+ image: quay.io/ibmmas/cli:13.15.2
727
727
  imagePullPolicy: $(params.image_pull_policy)
728
728
  workingDir: /workspace/configs
729
729
 
@@ -843,7 +843,7 @@ spec:
843
843
  command:
844
844
  - /opt/app-root/src/run-role.sh
845
845
  - cp4d_service
846
- image: quay.io/ibmmas/cli:13.15.0
846
+ image: quay.io/ibmmas/cli:13.15.2
847
847
  imagePullPolicy: $(params.image_pull_policy)
848
848
  workingDir: /workspace/configs
849
849
  # --------------------------------------------------------------------------------
@@ -960,7 +960,7 @@ spec:
960
960
  command:
961
961
  - /opt/app-root/src/run-role.sh
962
962
  - cp4d_service
963
- image: quay.io/ibmmas/cli:13.15.0
963
+ image: quay.io/ibmmas/cli:13.15.2
964
964
  imagePullPolicy: $(params.image_pull_policy)
965
965
  workingDir: /workspace/configs
966
966
 
@@ -1066,7 +1066,7 @@ spec:
1066
1066
  command:
1067
1067
  - /opt/app-root/src/run-role.sh
1068
1068
  - cp4d
1069
- image: quay.io/ibmmas/cli:13.15.0
1069
+ image: quay.io/ibmmas/cli:13.15.2
1070
1070
  imagePullPolicy: $(params.image_pull_policy)
1071
1071
  # --------------------------------------------------------------------------------
1072
1072
  # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1388,7 +1388,7 @@ spec:
1388
1388
  command:
1389
1389
  - /opt/app-root/src/run-role.sh
1390
1390
  - db2
1391
- image: quay.io/ibmmas/cli:13.15.0
1391
+ image: quay.io/ibmmas/cli:13.15.2
1392
1392
  imagePullPolicy: $(params.image_pull_policy)
1393
1393
  workingDir: /workspace/configs
1394
1394
 
@@ -1498,7 +1498,7 @@ spec:
1498
1498
  command:
1499
1499
  - /opt/app-root/src/run-role.sh
1500
1500
  - eck
1501
- image: quay.io/ibmmas/cli:13.15.0
1501
+ image: quay.io/ibmmas/cli:13.15.2
1502
1502
  imagePullPolicy: $(params.image_pull_policy)
1503
1503
  # --------------------------------------------------------------------------------
1504
1504
  # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1587,7 +1587,7 @@ spec:
1587
1587
  command:
1588
1588
  - /opt/app-root/src/run-role.sh
1589
1589
  - gencfg_workspace
1590
- image: quay.io/ibmmas/cli:13.15.0
1590
+ image: quay.io/ibmmas/cli:13.15.2
1591
1591
  imagePullPolicy: $(params.image_pull_policy)
1592
1592
  workingDir: /workspace/configs
1593
1593
 
@@ -1691,7 +1691,7 @@ spec:
1691
1691
  - -c
1692
1692
  name: gitops-bootstrap
1693
1693
  imagePullPolicy: IfNotPresent
1694
- image: quay.io/ibmmas/cli:13.15.0
1694
+ image: quay.io/ibmmas/cli:13.15.2
1695
1695
  workspaces:
1696
1696
  - name: configs
1697
1697
  # --------------------------------------------------------------------------------
@@ -1773,7 +1773,7 @@ spec:
1773
1773
  - -c
1774
1774
  name: gitops-cis-compliance
1775
1775
  imagePullPolicy: IfNotPresent
1776
- image: quay.io/ibmmas/cli:13.15.0
1776
+ image: quay.io/ibmmas/cli:13.15.2
1777
1777
  workspaces:
1778
1778
  - name: configs
1779
1779
  # --------------------------------------------------------------------------------
@@ -2078,7 +2078,7 @@ spec:
2078
2078
  - -c
2079
2079
  name: gitops-cluster
2080
2080
  imagePullPolicy: Always
2081
- image: quay.io/ibmmas/cli:13.15.0
2081
+ image: quay.io/ibmmas/cli:13.15.2
2082
2082
  workspaces:
2083
2083
  - name: configs
2084
2084
  # --------------------------------------------------------------------------------
@@ -2186,7 +2186,7 @@ spec:
2186
2186
  - -c
2187
2187
  name: gitops-cos
2188
2188
  imagePullPolicy: IfNotPresent
2189
- image: quay.io/ibmmas/cli:13.15.0
2189
+ image: quay.io/ibmmas/cli:13.15.2
2190
2190
  workspaces:
2191
2191
  - name: configs
2192
2192
  # --------------------------------------------------------------------------------
@@ -2334,7 +2334,7 @@ spec:
2334
2334
  - -c
2335
2335
  name: gitops-cp4d-service
2336
2336
  imagePullPolicy: IfNotPresent
2337
- image: quay.io/ibmmas/cli:13.15.0
2337
+ image: quay.io/ibmmas/cli:13.15.2
2338
2338
  workspaces:
2339
2339
  - name: configs
2340
2340
  - name: shared-gitops-configs
@@ -2463,7 +2463,7 @@ spec:
2463
2463
  - -c
2464
2464
  name: gitops-cp4d
2465
2465
  imagePullPolicy: IfNotPresent
2466
- image: quay.io/ibmmas/cli:13.15.0
2466
+ image: quay.io/ibmmas/cli:13.15.2
2467
2467
  workspaces:
2468
2468
  - name: configs
2469
2469
  - name: shared-gitops-configs
@@ -2754,7 +2754,7 @@ spec:
2754
2754
  - -c
2755
2755
  name: gitops-db2u-database
2756
2756
  imagePullPolicy: Always
2757
- image: quay.io/ibmmas/cli:13.15.0
2757
+ image: quay.io/ibmmas/cli:13.15.2
2758
2758
  workspaces:
2759
2759
  - name: configs
2760
2760
  - name: shared-gitops-configs
@@ -2852,7 +2852,7 @@ spec:
2852
2852
  - -c
2853
2853
  name: gitops-db2u
2854
2854
  imagePullPolicy: IfNotPresent
2855
- image: quay.io/ibmmas/cli:13.15.0
2855
+ image: quay.io/ibmmas/cli:13.15.2
2856
2856
  workspaces:
2857
2857
  - name: configs
2858
2858
  # --------------------------------------------------------------------------------
@@ -2979,7 +2979,7 @@ spec:
2979
2979
  - -c
2980
2980
  name: gitops-delete-jdbc-config
2981
2981
  imagePullPolicy: IfNotPresent
2982
- image: quay.io/ibmmas/cli:13.15.0
2982
+ image: quay.io/ibmmas/cli:13.15.2
2983
2983
  workspaces:
2984
2984
  - name: configs
2985
2985
  # --------------------------------------------------------------------------------
@@ -3077,7 +3077,7 @@ spec:
3077
3077
  - -c
3078
3078
  name: gitops-delete-kafka-config
3079
3079
  imagePullPolicy: Always
3080
- image: quay.io/ibmmas/cli:13.15.0
3080
+ image: quay.io/ibmmas/cli:13.15.2
3081
3081
  workspaces:
3082
3082
  - name: configs
3083
3083
 
@@ -3169,7 +3169,7 @@ spec:
3169
3169
  - -c
3170
3170
  name: gitops-deprovision-app-config
3171
3171
  imagePullPolicy: IfNotPresent
3172
- image: quay.io/ibmmas/cli:13.15.0
3172
+ image: quay.io/ibmmas/cli:13.15.2
3173
3173
  workspaces:
3174
3174
  - name: configs
3175
3175
  # --------------------------------------------------------------------------------
@@ -3254,7 +3254,7 @@ spec:
3254
3254
  - -c
3255
3255
  name: gitops-deprovision-app-install
3256
3256
  imagePullPolicy: IfNotPresent
3257
- image: quay.io/ibmmas/cli:13.15.0
3257
+ image: quay.io/ibmmas/cli:13.15.2
3258
3258
  workspaces:
3259
3259
  - name: configs
3260
3260
  # --------------------------------------------------------------------------------
@@ -3339,7 +3339,7 @@ spec:
3339
3339
  - -c
3340
3340
  name: gitops-deprovision-cluster
3341
3341
  imagePullPolicy: IfNotPresent
3342
- image: quay.io/ibmmas/cli:13.15.0
3342
+ image: quay.io/ibmmas/cli:13.15.2
3343
3343
  workspaces:
3344
3344
  - name: configs
3345
3345
  # --------------------------------------------------------------------------------
@@ -3458,7 +3458,7 @@ spec:
3458
3458
  - -c
3459
3459
  name: gitops-deprovision-cos
3460
3460
  imagePullPolicy: IfNotPresent
3461
- image: quay.io/ibmmas/cli:13.15.0
3461
+ image: quay.io/ibmmas/cli:13.15.2
3462
3462
  workspaces:
3463
3463
  - name: configs
3464
3464
  # --------------------------------------------------------------------------------
@@ -3551,7 +3551,7 @@ spec:
3551
3551
  - -c
3552
3552
  name: gitops-deprovision-db2u-database
3553
3553
  imagePullPolicy: IfNotPresent
3554
- image: quay.io/ibmmas/cli:13.15.0
3554
+ image: quay.io/ibmmas/cli:13.15.2
3555
3555
  workspaces:
3556
3556
  - name: configs
3557
3557
 
@@ -3634,7 +3634,7 @@ spec:
3634
3634
  - -c
3635
3635
  name: gitops-deprovision-db2u
3636
3636
  imagePullPolicy: IfNotPresent
3637
- image: quay.io/ibmmas/cli:13.15.0
3637
+ image: quay.io/ibmmas/cli:13.15.2
3638
3638
  workspaces:
3639
3639
  - name: configs
3640
3640
 
@@ -3751,7 +3751,7 @@ spec:
3751
3751
  - -c
3752
3752
  name: gitops-deprovision-efs
3753
3753
  imagePullPolicy: IfNotPresent
3754
- image: quay.io/ibmmas/cli:13.15.0
3754
+ image: quay.io/ibmmas/cli:13.15.2
3755
3755
  workspaces:
3756
3756
  - name: configs
3757
3757
 
@@ -3861,7 +3861,7 @@ spec:
3861
3861
  - -c
3862
3862
  name: gitops-deprovision-kafka
3863
3863
  imagePullPolicy: IfNotPresent
3864
- image: quay.io/ibmmas/cli:13.15.0
3864
+ image: quay.io/ibmmas/cli:13.15.2
3865
3865
  workspaces:
3866
3866
  - name: configs
3867
3867
  # --------------------------------------------------------------------------------
@@ -3964,7 +3964,7 @@ spec:
3964
3964
  - -c
3965
3965
  name: gitops-deprovision-mongo
3966
3966
  imagePullPolicy: IfNotPresent
3967
- image: quay.io/ibmmas/cli:13.15.0
3967
+ image: quay.io/ibmmas/cli:13.15.2
3968
3968
  workspaces:
3969
3969
  - name: configs
3970
3970
 
@@ -4021,7 +4021,7 @@ spec:
4021
4021
  - -c
4022
4022
  name: gitops-deprovision-rosa
4023
4023
  imagePullPolicy: IfNotPresent
4024
- image: quay.io/ibmmas/cli:13.15.0
4024
+ image: quay.io/ibmmas/cli:13.15.2
4025
4025
  workspaces:
4026
4026
  - name: configs
4027
4027
  # --------------------------------------------------------------------------------
@@ -4226,7 +4226,7 @@ spec:
4226
4226
  - -c
4227
4227
  name: gitops-deprovision-suite-config
4228
4228
  imagePullPolicy: IfNotPresent
4229
- image: quay.io/ibmmas/cli:13.15.0
4229
+ image: quay.io/ibmmas/cli:13.15.2
4230
4230
  workspaces:
4231
4231
  - name: configs
4232
4232
 
@@ -4324,7 +4324,7 @@ spec:
4324
4324
  - -c
4325
4325
  name: gitops-deprovision-suite-idp-config
4326
4326
  imagePullPolicy: IfNotPresent
4327
- image: quay.io/ibmmas/cli:13.15.0
4327
+ image: quay.io/ibmmas/cli:13.15.2
4328
4328
  workspaces:
4329
4329
  - name: configs
4330
4330
  # --------------------------------------------------------------------------------
@@ -4416,7 +4416,7 @@ spec:
4416
4416
  - -c
4417
4417
  name: gitops-deprovision-suite-objectstorage-config
4418
4418
  imagePullPolicy: IfNotPresent
4419
- image: quay.io/ibmmas/cli:13.15.0
4419
+ image: quay.io/ibmmas/cli:13.15.2
4420
4420
  workspaces:
4421
4421
  - name: configs
4422
4422
  # --------------------------------------------------------------------------------
@@ -4628,7 +4628,7 @@ spec:
4628
4628
  - -c
4629
4629
  name: gitops-deprovision-suite-smtp-config
4630
4630
  imagePullPolicy: IfNotPresent
4631
- image: quay.io/ibmmas/cli:13.15.0
4631
+ image: quay.io/ibmmas/cli:13.15.2
4632
4632
  workspaces:
4633
4633
  - name: configs
4634
4634
  # --------------------------------------------------------------------------------
@@ -4721,7 +4721,7 @@ spec:
4721
4721
  - -c
4722
4722
  name: gitops-deprovision-suite-watson-studio-config
4723
4723
  imagePullPolicy: IfNotPresent
4724
- image: quay.io/ibmmas/cli:13.15.0
4724
+ image: quay.io/ibmmas/cli:13.15.2
4725
4725
  workspaces:
4726
4726
  - name: configs
4727
4727
  # --------------------------------------------------------------------------------
@@ -4812,7 +4812,7 @@ spec:
4812
4812
  - -c
4813
4813
  name: gitops-deprovision-suite-workspace
4814
4814
  imagePullPolicy: Always
4815
- image: quay.io/ibmmas/cli:13.15.0
4815
+ image: quay.io/ibmmas/cli:13.15.2
4816
4816
  workspaces:
4817
4817
  - name: configs
4818
4818
  # --------------------------------------------------------------------------------
@@ -4905,7 +4905,7 @@ spec:
4905
4905
  - -c
4906
4906
  name: gitops-deprovision-suite
4907
4907
  imagePullPolicy: IfNotPresent
4908
- image: quay.io/ibmmas/cli:13.15.0
4908
+ image: quay.io/ibmmas/cli:13.15.2
4909
4909
  workspaces:
4910
4910
  - name: configs
4911
4911
 
@@ -5018,7 +5018,7 @@ spec:
5018
5018
  - -c
5019
5019
  name: gitops-dro
5020
5020
  imagePullPolicy: IfNotPresent
5021
- image: quay.io/ibmmas/cli:13.15.0
5021
+ image: quay.io/ibmmas/cli:13.15.2
5022
5022
  workspaces:
5023
5023
  - name: configs
5024
5024
  # --------------------------------------------------------------------------------
@@ -5145,7 +5145,7 @@ spec:
5145
5145
  - -c
5146
5146
  name: gitops-efs
5147
5147
  imagePullPolicy: IfNotPresent
5148
- image: quay.io/ibmmas/cli:13.15.0
5148
+ image: quay.io/ibmmas/cli:13.15.2
5149
5149
  workspaces:
5150
5150
  - name: configs
5151
5151
 
@@ -5280,7 +5280,7 @@ spec:
5280
5280
  - -c
5281
5281
  name: gitops-jdbc-config
5282
5282
  imagePullPolicy: Always
5283
- image: quay.io/ibmmas/cli:13.15.0
5283
+ image: quay.io/ibmmas/cli:13.15.2
5284
5284
  workspaces:
5285
5285
  - name: configs
5286
5286
  - name: shared-gitops-configs
@@ -5376,7 +5376,7 @@ spec:
5376
5376
  - -c
5377
5377
  name: gitops-kafka-config
5378
5378
  imagePullPolicy: Always
5379
- image: quay.io/ibmmas/cli:13.15.0
5379
+ image: quay.io/ibmmas/cli:13.15.2
5380
5380
  workspaces:
5381
5381
  - name: configs
5382
5382
 
@@ -5498,7 +5498,7 @@ spec:
5498
5498
  - -c
5499
5499
  name: gitops-kafka
5500
5500
  imagePullPolicy: IfNotPresent
5501
- image: quay.io/ibmmas/cli:13.15.0
5501
+ image: quay.io/ibmmas/cli:13.15.2
5502
5502
  workspaces:
5503
5503
  - name: configs
5504
5504
  # --------------------------------------------------------------------------------
@@ -5624,7 +5624,7 @@ spec:
5624
5624
  - -c
5625
5625
  name: gitops-license
5626
5626
  imagePullPolicy: Always
5627
- image: quay.io/ibmmas/cli:13.15.0
5627
+ image: quay.io/ibmmas/cli:13.15.2
5628
5628
  workspaces:
5629
5629
  - name: shared-entitlement
5630
5630
 
@@ -5809,6 +5809,8 @@ spec:
5809
5809
  stepTemplate:
5810
5810
  name: gitops-mas-fvt-preparer
5811
5811
  env:
5812
+ - name: TERM
5813
+ value: xterm
5812
5814
  - name: CLUSTER_NAME
5813
5815
  value: $(params.cluster_name)
5814
5816
  - name: ACCOUNT_ID
@@ -5827,6 +5829,8 @@ spec:
5827
5829
  value: $(params.mas_instance_id)
5828
5830
  - name: MAS_INSTANCE_ID
5829
5831
  value: $(params.mas_instance_id)
5832
+ - name: FVT_ENVIRONMENT
5833
+ value: $(params.mas_instance_id)
5830
5834
  - name: PIPELINE_STORAGE_CLASS
5831
5835
  value: $(params.pipeline_storage_class)
5832
5836
  - name: AWS_REGION
@@ -5951,6 +5955,17 @@ spec:
5951
5955
  set -o pipefail
5952
5956
  trap '[[ $? -eq 1 ]] && mas must-gather --directory /workspace/mustgather --extra-namespaces selenium' ERR EXIT
5953
5957
 
5958
+ get_trailing_number() {
5959
+ local input_string="$1"
5960
+ local trailing_number=$(echo $input_string | grep -Eo '[0-9]+$')
5961
+
5962
+ if [[ -n "$trailing_number" ]]; then
5963
+ echo "$trailing_number"
5964
+ else
5965
+ echo ""
5966
+ fi
5967
+ }
5968
+
5954
5969
  export ARTIFACTORY_TOKEN=${FVT_ARTIFACTORY_TOKEN}
5955
5970
  export ARTIFACTORY_UPLOAD_DIR=${ARTIFACTORY_GENERIC_LOGS_URL}/mas-fvt/${MAS_INSTANCE_ID}/${DEVOPS_BUILD_NUMBER}
5956
5971
 
@@ -6151,8 +6166,18 @@ spec:
6151
6166
  echo "Sleeping for 180 seconds to give postsync job a chance to run before creating sync window"
6152
6167
  sleep 180
6153
6168
 
6154
- echo "argo:argocd proj windows add mas --kind deny --schedule * * * * * --duration 4h --applications *"
6155
- argocd proj windows add mas --kind deny --schedule "* * * * *" --duration 4h --applications "*.$MAS_INSTANCE_ID"
6169
+ # Get the trailing number of the MAS instanceid so we can modify the sync window duration. This is because
6170
+ # you can't have two sync windows with the same schedule and duration even if for different apps
6171
+ RESULT=$(get_trailing_number $MAS_INSTANCE_ID)
6172
+ if [[ -n "$RESULT" ]]; then
6173
+ WINDOW_DURATION=$((4 + RESULT))
6174
+ else
6175
+ #Set to 4 when there is no trailing number
6176
+ WINDOW_DURATION=4
6177
+ fi
6178
+
6179
+ echo "argo:argocd proj windows add mas --kind deny --schedule * * * * * --duration ${WINDOW_DURATION}h --applications *"
6180
+ argocd proj windows add mas --kind deny --schedule "* * * * *" --duration ${WINDOW_DURATION}h --applications "*.$MAS_INSTANCE_ID"
6156
6181
 
6157
6182
  UNESCAPED_LDAP_CRT=$(</workspace/shared-additional-configs/ldap_masdeps1_cert.pem)
6158
6183
  ESCAPED_LDAP_CRT=${UNESCAPED_LDAP_CRT//\"/\\\"}
@@ -6188,7 +6213,7 @@ spec:
6188
6213
  - -c
6189
6214
  name: gitops-mas-fvt-preparer
6190
6215
  imagePullPolicy: Always
6191
- image: quay.io/ibmmas/cli:13.15.0
6216
+ image: quay.io/ibmmas/cli:13.15.2
6192
6217
  workspaces:
6193
6218
  - name: configs
6194
6219
  - name: shared-additional-configs
@@ -6224,6 +6249,9 @@ spec:
6224
6249
  type: string
6225
6250
  - name: source_path
6226
6251
  type: string
6252
+ - name: git_commit_msg
6253
+ type: string
6254
+ default: "gitops-initiator deploy"
6227
6255
  - name: mas_channel
6228
6256
  type: string
6229
6257
  - name: mas_operationalmode
@@ -6330,6 +6358,8 @@ spec:
6330
6358
  value: $(params.source_github_repo)
6331
6359
  - name: SOURCE_PATH
6332
6360
  value: $(params.source_path)
6361
+ - name: GIT_COMMIT_MSG
6362
+ value: $(params.git_commit_msg)
6333
6363
  - name: MAS_CHANNEL
6334
6364
  value: $(params.mas_channel)
6335
6365
  - name: MAS_OPERATIONALMODE
@@ -6442,8 +6472,14 @@ spec:
6442
6472
 
6443
6473
  mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME
6444
6474
 
6475
+ set +e +o pipefail
6445
6476
  echo "copying $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/* to $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME"
6446
- cp -r $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME
6477
+ cp --no-clobber $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME
6478
+ set -e -o pipefail
6479
+
6480
+ mkdir -p $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID
6481
+ echo "copying $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/* to $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID"
6482
+ cp -r $SOURCE_LOCAL_DIR/$SOURCE_GITHUB_REPO/$SOURCE_PATH/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/* $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/
6447
6483
 
6448
6484
  echo "gitops-mas-initiator:: DNS_PROVIDER_CONTROL_IDEN=${DNS_PROVIDER_CONTROL_IDEN} MANUAL_CERTS_CONTROL_FLAG=${MANUAL_CERTS_CONTROL_FLAG}"
6449
6485
  if [[ "${MANUAL_CERTS_CONTROL_FLAG}" == "true" ]]; then
@@ -6466,6 +6502,12 @@ spec:
6466
6502
 
6467
6503
  # Remove manual-certs folder
6468
6504
  rm -rf $TARGET_LOCAL_DIR/manual-certs
6505
+
6506
+ echo "gitops-mas-initiator: setting dns.cis.proxy enhanced_security and waf to false"
6507
+ yq -i '.dns.cis.proxy = false' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
6508
+ yq -i '.dns.cis.enhanced_security = false' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
6509
+ yq -i '.dns.cis.waf = false' $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO/gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-instance-params.yaml
6510
+
6469
6511
  fi
6470
6512
 
6471
6513
  cd $TARGET_LOCAL_DIR/$TARGET_GITHUB_REPO
@@ -6582,6 +6624,13 @@ spec:
6582
6624
  yq -i '.fvt.ansible_version = env(FVT_ANSIBLE_VERSION)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-fvt-params.yaml
6583
6625
  fi
6584
6626
 
6627
+ if [[ ! "$GIT_COMMIT_MSG" =~ ^"[skip deploy]" ]]; then
6628
+ # Append a new line to the file to drive the deployment at cluster level
6629
+ echo "" >> gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/cluster-params.yaml
6630
+ else
6631
+ echo "Commit message starts with [skip deploy], no changes made."
6632
+ fi
6633
+
6585
6634
  echo "git: Adding all files in $TARGET_LOCAL_DIR working directory"
6586
6635
  FILES_ADDED_OUTPUT="$(git add -v .)"
6587
6636
  return_code=$?
@@ -6592,10 +6641,9 @@ spec:
6592
6641
  export FILES_ADDED=$(echo "$FILES_ADDED_OUTPUT" | awk NF | wc -l | xargs)
6593
6642
  echo "git: Added ${FILES_ADDED} files"
6594
6643
 
6595
- export COMMIT_MSG="gitops-initiator deploy for $CLUSTER_NAME"
6596
6644
  if [ "$FILES_ADDED" != "0" ]; then
6597
- echo "git: Committing files using message $COMMIT_MSG"
6598
- git commit -m "$COMMIT_MSG" || exit 1
6645
+ echo "git: Committing files using message $GIT_COMMIT_MSG"
6646
+ git commit -m "$GIT_COMMIT_MSG" || exit 1
6599
6647
  retries=5
6600
6648
  interval=30
6601
6649
  index=0
@@ -6635,7 +6683,7 @@ spec:
6635
6683
  - -c
6636
6684
  name: gitops-mas-initiator
6637
6685
  imagePullPolicy: IfNotPresent
6638
- image: quay.io/ibmmas/cli:13.15.0
6686
+ image: quay.io/ibmmas/cli:13.15.2
6639
6687
  workspaces:
6640
6688
  - name: configs
6641
6689
  # --------------------------------------------------------------------------------
@@ -6743,7 +6791,7 @@ spec:
6743
6791
  - -c
6744
6792
  name: gitops-mongo
6745
6793
  imagePullPolicy: IfNotPresent
6746
- image: quay.io/ibmmas/cli:13.15.0
6794
+ image: quay.io/ibmmas/cli:13.15.2
6747
6795
  workspaces:
6748
6796
  - name: configs
6749
6797
 
@@ -6869,7 +6917,7 @@ spec:
6869
6917
  - -c
6870
6918
  name: gitops-nvidia-gpu
6871
6919
  imagePullPolicy: IfNotPresent
6872
- image: quay.io/ibmmas/cli:13.15.0
6920
+ image: quay.io/ibmmas/cli:13.15.2
6873
6921
  workspaces:
6874
6922
  - name: configs
6875
6923
  # --------------------------------------------------------------------------------
@@ -6987,7 +7035,7 @@ spec:
6987
7035
  - -c
6988
7036
  name: gitops-process-mongo-user
6989
7037
  imagePullPolicy: IfNotPresent
6990
- image: quay.io/ibmmas/cli:13.15.0
7038
+ image: quay.io/ibmmas/cli:13.15.2
6991
7039
  workspaces:
6992
7040
  - name: configs
6993
7041
  # --------------------------------------------------------------------------------
@@ -7043,7 +7091,7 @@ spec:
7043
7091
  - -c
7044
7092
  name: gitops-rosa
7045
7093
  imagePullPolicy: IfNotPresent
7046
- image: quay.io/ibmmas/cli:13.15.0
7094
+ image: quay.io/ibmmas/cli:13.15.2
7047
7095
  workspaces:
7048
7096
  - name: configs
7049
7097
  # --------------------------------------------------------------------------------
@@ -7230,7 +7278,7 @@ spec:
7230
7278
  - -c
7231
7279
  name: gitops-suite-app-config
7232
7280
  imagePullPolicy: IfNotPresent
7233
- image: quay.io/ibmmas/cli:13.15.0
7281
+ image: quay.io/ibmmas/cli:13.15.2
7234
7282
  workspaces:
7235
7283
  - name: configs
7236
7284
  - name: shared-gitops-configs
@@ -7388,7 +7436,7 @@ spec:
7388
7436
  - -c
7389
7437
  name: gitops-suite-app-install
7390
7438
  imagePullPolicy: Always
7391
- image: quay.io/ibmmas/cli:13.15.0
7439
+ image: quay.io/ibmmas/cli:13.15.2
7392
7440
  workspaces:
7393
7441
  - name: configs
7394
7442
  - name: shared-gitops-configs
@@ -7494,7 +7542,7 @@ spec:
7494
7542
  - -c
7495
7543
  name: gitops-suite-certs
7496
7544
  imagePullPolicy: IfNotPresent
7497
- image: quay.io/ibmmas/cli:13.15.0
7545
+ image: quay.io/ibmmas/cli:13.15.2
7498
7546
  workspaces:
7499
7547
  - name: configs
7500
7548
  - name: certificates
@@ -7664,7 +7712,7 @@ spec:
7664
7712
  - -c
7665
7713
  name: gitops-suite-config
7666
7714
  imagePullPolicy: IfNotPresent
7667
- image: quay.io/ibmmas/cli:13.15.0
7715
+ image: quay.io/ibmmas/cli:13.15.2
7668
7716
  workspaces:
7669
7717
  - name: configs
7670
7718
  - name: shared-additional-configs
@@ -7764,7 +7812,7 @@ spec:
7764
7812
  - -c
7765
7813
  name: gitops-suite-dns
7766
7814
  imagePullPolicy: IfNotPresent
7767
- image: quay.io/ibmmas/cli:13.15.0
7815
+ image: quay.io/ibmmas/cli:13.15.2
7768
7816
  workspaces:
7769
7817
  - name: configs
7770
7818
 
@@ -7888,7 +7936,7 @@ spec:
7888
7936
  - -c
7889
7937
  name: gitops-suite-idp-config
7890
7938
  imagePullPolicy: IfNotPresent
7891
- image: quay.io/ibmmas/cli:13.15.0
7939
+ image: quay.io/ibmmas/cli:13.15.2
7892
7940
  workspaces:
7893
7941
  - name: configs
7894
7942
  - name: shared-additional-configs
@@ -7989,7 +8037,7 @@ spec:
7989
8037
  - -c
7990
8038
  name: gitops-suite-objectstorage-config
7991
8039
  imagePullPolicy: IfNotPresent
7992
- image: quay.io/ibmmas/cli:13.15.0
8040
+ image: quay.io/ibmmas/cli:13.15.2
7993
8041
  workspaces:
7994
8042
  - name: configs
7995
8043
  - name: shared-gitops-configs
@@ -8400,7 +8448,7 @@ spec:
8400
8448
  - -c
8401
8449
  name: gitops-suite-smtp-config
8402
8450
  imagePullPolicy: IfNotPresent
8403
- image: quay.io/ibmmas/cli:13.15.0
8451
+ image: quay.io/ibmmas/cli:13.15.2
8404
8452
  workspaces:
8405
8453
  - name: configs
8406
8454
 
@@ -8520,7 +8568,7 @@ spec:
8520
8568
  - -c
8521
8569
  name: gitops-suite-watson-studio-config
8522
8570
  imagePullPolicy: IfNotPresent
8523
- image: quay.io/ibmmas/cli:13.15.0
8571
+ image: quay.io/ibmmas/cli:13.15.2
8524
8572
  workspaces:
8525
8573
  - name: configs
8526
8574
  - name: shared-gitops-configs
@@ -8622,7 +8670,7 @@ spec:
8622
8670
  - -c
8623
8671
  name: gitops-suite-workspace
8624
8672
  imagePullPolicy: IfNotPresent
8625
- image: quay.io/ibmmas/cli:13.15.0
8673
+ image: quay.io/ibmmas/cli:13.15.2
8626
8674
  workspaces:
8627
8675
  - name: configs
8628
8676
  # --------------------------------------------------------------------------------
@@ -8858,6 +8906,7 @@ spec:
8858
8906
 
8859
8907
  - name: ALLOW_LIST
8860
8908
  value: $(params.allow_list)
8909
+
8861
8910
  envFrom:
8862
8911
  - configMapRef:
8863
8912
  name: environment-properties
@@ -8913,7 +8962,7 @@ spec:
8913
8962
  - -c
8914
8963
  name: gitops-suite
8915
8964
  imagePullPolicy: IfNotPresent
8916
- image: quay.io/ibmmas/cli:13.15.0
8965
+ image: quay.io/ibmmas/cli:13.15.2
8917
8966
  workspaces:
8918
8967
  - name: configs
8919
8968
  - name: shared-gitops-configs
@@ -8963,7 +9012,7 @@ spec:
8963
9012
 
8964
9013
  steps:
8965
9014
  - name: grafana
8966
- image: quay.io/ibmmas/cli:13.15.0
9015
+ image: quay.io/ibmmas/cli:13.15.2
8967
9016
  imagePullPolicy: $(params.image_pull_policy)
8968
9017
  command:
8969
9018
  - /opt/app-root/src/run-role.sh
@@ -9097,7 +9146,7 @@ spec:
9097
9146
  command:
9098
9147
  - /opt/app-root/src/run-role.sh
9099
9148
  - ibm_catalogs
9100
- image: quay.io/ibmmas/cli:13.15.0
9149
+ image: quay.io/ibmmas/cli:13.15.2
9101
9150
  imagePullPolicy: $(params.image_pull_policy)
9102
9151
  workingDir: /workspace/configs
9103
9152
  # --------------------------------------------------------------------------------
@@ -9339,7 +9388,7 @@ spec:
9339
9388
  command:
9340
9389
  - /opt/app-root/src/run-role.sh
9341
9390
  - kafka
9342
- image: quay.io/ibmmas/cli:13.15.0
9391
+ image: quay.io/ibmmas/cli:13.15.2
9343
9392
  imagePullPolicy: $(params.image_pull_policy)
9344
9393
  workingDir: /workspace/configs
9345
9394
 
@@ -9555,7 +9604,7 @@ spec:
9555
9604
  command:
9556
9605
  - /opt/app-root/src/run-role.sh
9557
9606
  - kmodels
9558
- image: quay.io/ibmmas/cli:13.15.0
9607
+ image: quay.io/ibmmas/cli:13.15.2
9559
9608
  imagePullPolicy: $(params.image_pull_policy)
9560
9609
  # --------------------------------------------------------------------------------
9561
9610
  # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -9733,7 +9782,7 @@ spec:
9733
9782
  command:
9734
9783
  - /opt/app-root/src/run-role.sh
9735
9784
  - mongodb
9736
- image: quay.io/ibmmas/cli:13.15.0
9785
+ image: quay.io/ibmmas/cli:13.15.2
9737
9786
  imagePullPolicy: $(params.image_pull_policy)
9738
9787
  workingDir: /workspace/configs
9739
9788
 
@@ -9776,7 +9825,7 @@ spec:
9776
9825
  - $(params.base_output_dir)
9777
9826
  - --extra-namespaces
9778
9827
  - selenium
9779
- image: quay.io/ibmmas/cli:13.15.0
9828
+ image: quay.io/ibmmas/cli:13.15.2
9780
9829
  imagePullPolicy: $(params.image_pull_policy)
9781
9830
  env:
9782
9831
  - name: DEVOPS_MONGO_URI
@@ -9893,7 +9942,7 @@ spec:
9893
9942
  command:
9894
9943
  - /opt/app-root/src/run-role.sh
9895
9944
  - nvidia_gpu
9896
- image: quay.io/ibmmas/cli:13.15.0
9945
+ image: quay.io/ibmmas/cli:13.15.2
9897
9946
  imagePullPolicy: $(params.image_pull_policy)
9898
9947
  workingDir: /workspace/configs
9899
9948
 
@@ -9929,7 +9978,7 @@ spec:
9929
9978
  # Verify Cluster
9930
9979
  # -------------------------------------------------------------------------
9931
9980
  - name: ocp-verify-cluster
9932
- image: quay.io/ibmmas/cli:13.15.0
9981
+ image: quay.io/ibmmas/cli:13.15.2
9933
9982
  imagePullPolicy: $(params.image_pull_policy)
9934
9983
  command:
9935
9984
  - /opt/app-root/src/run-role.sh
@@ -9971,7 +10020,7 @@ spec:
9971
10020
  # Verify Catalogs
9972
10021
  # -------------------------------------------------------------------------
9973
10022
  - name: ocp-verify-catalogs
9974
- image: quay.io/ibmmas/cli:13.15.0
10023
+ image: quay.io/ibmmas/cli:13.15.2
9975
10024
  imagePullPolicy: $(params.image_pull_policy)
9976
10025
  command:
9977
10026
  - /opt/app-root/src/run-role.sh
@@ -10013,7 +10062,7 @@ spec:
10013
10062
  # Verify Subscriptions
10014
10063
  # -------------------------------------------------------------------------
10015
10064
  - name: ocp-verify-subscriptions
10016
- image: quay.io/ibmmas/cli:13.15.0
10065
+ image: quay.io/ibmmas/cli:13.15.2
10017
10066
  imagePullPolicy: $(params.image_pull_policy)
10018
10067
  command:
10019
10068
  - /opt/app-root/src/run-role.sh
@@ -10055,7 +10104,7 @@ spec:
10055
10104
  # Verify Workloads
10056
10105
  # -------------------------------------------------------------------------
10057
10106
  - name: ocp-verify-workloads
10058
- image: quay.io/ibmmas/cli:13.15.0
10107
+ image: quay.io/ibmmas/cli:13.15.2
10059
10108
  imagePullPolicy: $(params.image_pull_policy)
10060
10109
  command:
10061
10110
  - /opt/app-root/src/run-role.sh
@@ -10097,7 +10146,7 @@ spec:
10097
10146
  # Verify Catalogs - Ingress TLS
10098
10147
  # -------------------------------------------------------------------------
10099
10148
  - name: ocp-verify-ingress
10100
- image: quay.io/ibmmas/cli:13.15.0
10149
+ image: quay.io/ibmmas/cli:13.15.2
10101
10150
  imagePullPolicy: $(params.image_pull_policy)
10102
10151
  command:
10103
10152
  - /opt/app-root/src/run-role.sh
@@ -10223,7 +10272,7 @@ spec:
10223
10272
  command:
10224
10273
  - /opt/app-root/src/run-role.sh
10225
10274
  - ocp_verify
10226
- image: quay.io/ibmmas/cli:13.15.0
10275
+ image: quay.io/ibmmas/cli:13.15.2
10227
10276
  imagePullPolicy: $(params.image_pull_policy)
10228
10277
  workingDir: /workspace/configs
10229
10278
  # --------------------------------------------------------------------------------
@@ -10291,7 +10340,7 @@ spec:
10291
10340
  command:
10292
10341
  - /opt/app-root/src/run-role.sh
10293
10342
  - ocs
10294
- image: quay.io/ibmmas/cli:13.15.0
10343
+ image: quay.io/ibmmas/cli:13.15.2
10295
10344
  imagePullPolicy: $(params.image_pull_policy)
10296
10345
  workingDir: /workspace/configs
10297
10346
 
@@ -10527,7 +10576,7 @@ spec:
10527
10576
  command:
10528
10577
  - /opt/app-root/src/run-role.sh
10529
10578
  - odh
10530
- image: quay.io/ibmmas/cli:13.15.0
10579
+ image: quay.io/ibmmas/cli:13.15.2
10531
10580
  imagePullPolicy: $(params.image_pull_policy)
10532
10581
  # --------------------------------------------------------------------------------
10533
10582
  # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -10703,7 +10752,7 @@ spec:
10703
10752
  command:
10704
10753
  - /opt/app-root/src/run-role.sh
10705
10754
  - sls
10706
- image: quay.io/ibmmas/cli:13.15.0
10755
+ image: quay.io/ibmmas/cli:13.15.2
10707
10756
  imagePullPolicy: $(params.image_pull_policy)
10708
10757
  workingDir: /workspace/configs
10709
10758
 
@@ -11098,12 +11147,12 @@ spec:
11098
11147
  command:
11099
11148
  - /opt/app-root/src/run-role.sh
11100
11149
  - suite_app_config
11101
- image: quay.io/ibmmas/cli:13.15.0
11150
+ image: quay.io/ibmmas/cli:13.15.2
11102
11151
  imagePullPolicy: $(params.image_pull_policy)
11103
11152
 
11104
11153
  # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
11105
11154
  - name: app-cfg-post-verify
11106
- image: quay.io/ibmmas/cli:13.15.0
11155
+ image: quay.io/ibmmas/cli:13.15.2
11107
11156
  imagePullPolicy: $(params.image_pull_policy)
11108
11157
  command:
11109
11158
  - /opt/app-root/src/wait-for-configmap.sh
@@ -11298,7 +11347,7 @@ spec:
11298
11347
  command:
11299
11348
  - /opt/app-root/src/run-role.sh
11300
11349
  - suite_app_install
11301
- image: quay.io/ibmmas/cli:13.15.0
11350
+ image: quay.io/ibmmas/cli:13.15.2
11302
11351
  imagePullPolicy: $(params.image_pull_policy)
11303
11352
 
11304
11353
  workspaces:
@@ -11387,7 +11436,7 @@ spec:
11387
11436
  command:
11388
11437
  - /opt/app-root/src/run-role.sh
11389
11438
  - suite_app_rollback
11390
- image: quay.io/ibmmas/cli:13.15.0
11439
+ image: quay.io/ibmmas/cli:13.15.2
11391
11440
  imagePullPolicy: $(params.image_pull_policy)
11392
11441
  # --------------------------------------------------------------------------------
11393
11442
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -11450,7 +11499,7 @@ spec:
11450
11499
  command:
11451
11500
  - /opt/app-root/src/run-role.sh
11452
11501
  - suite_app_uninstall
11453
- image: quay.io/ibmmas/cli:13.15.0
11502
+ image: quay.io/ibmmas/cli:13.15.2
11454
11503
  imagePullPolicy: $(params.image_pull_policy)
11455
11504
  # --------------------------------------------------------------------------------
11456
11505
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -11525,7 +11574,7 @@ spec:
11525
11574
  command:
11526
11575
  - /opt/app-root/src/run-role.sh
11527
11576
  - suite_app_upgrade
11528
- image: quay.io/ibmmas/cli:13.15.0
11577
+ image: quay.io/ibmmas/cli:13.15.2
11529
11578
  imagePullPolicy: $(params.image_pull_policy)
11530
11579
  # --------------------------------------------------------------------------------
11531
11580
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -11626,7 +11675,7 @@ spec:
11626
11675
  command:
11627
11676
  - /opt/app-root/src/run-role.sh
11628
11677
  - suite_app_verify
11629
- image: quay.io/ibmmas/cli:13.15.0
11678
+ image: quay.io/ibmmas/cli:13.15.2
11630
11679
  imagePullPolicy: $(params.image_pull_policy)
11631
11680
  # --------------------------------------------------------------------------------
11632
11681
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -11769,7 +11818,7 @@ spec:
11769
11818
  command:
11770
11819
  - /opt/app-root/src/run-role.sh
11771
11820
  - suite_certs
11772
- image: quay.io/ibmmas/cli:13.15.0
11821
+ image: quay.io/ibmmas/cli:13.15.2
11773
11822
  imagePullPolicy: $(params.image_pull_policy)
11774
11823
 
11775
11824
  workspaces:
@@ -11836,7 +11885,7 @@ spec:
11836
11885
  command:
11837
11886
  - /opt/app-root/src/run-role.sh
11838
11887
  - suite_config
11839
- image: quay.io/ibmmas/cli:13.15.0
11888
+ image: quay.io/ibmmas/cli:13.15.2
11840
11889
  imagePullPolicy: $(params.image_pull_policy)
11841
11890
  workingDir: /workspace/configs
11842
11891
 
@@ -11907,7 +11956,7 @@ spec:
11907
11956
  command:
11908
11957
  - /opt/app-root/src/run-role.sh
11909
11958
  - suite_db2_setup_for_manage
11910
- image: quay.io/ibmmas/cli:13.15.0
11959
+ image: quay.io/ibmmas/cli:13.15.2
11911
11960
  imagePullPolicy: $(params.image_pull_policy)
11912
11961
  # --------------------------------------------------------------------------------
11913
11962
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -12097,7 +12146,7 @@ spec:
12097
12146
  command:
12098
12147
  - /opt/app-root/src/run-role.sh
12099
12148
  - suite_dns
12100
- image: quay.io/ibmmas/cli:13.15.0
12149
+ image: quay.io/ibmmas/cli:13.15.2
12101
12150
  imagePullPolicy: $(params.image_pull_policy)
12102
12151
  # --------------------------------------------------------------------------------
12103
12152
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -12346,7 +12395,7 @@ spec:
12346
12395
  command:
12347
12396
  - /opt/app-root/src/run-role.sh
12348
12397
  - suite_install
12349
- image: quay.io/ibmmas/cli:13.15.0
12398
+ image: quay.io/ibmmas/cli:13.15.2
12350
12399
  imagePullPolicy: $(params.image_pull_policy)
12351
12400
  workingDir: /workspace/configs
12352
12401
 
@@ -12434,7 +12483,7 @@ spec:
12434
12483
  command:
12435
12484
  - /opt/app-root/src/run-role.sh
12436
12485
  - suite_rollback
12437
- image: quay.io/ibmmas/cli:13.15.0
12486
+ image: quay.io/ibmmas/cli:13.15.2
12438
12487
  imagePullPolicy: $(params.image_pull_policy)
12439
12488
  # --------------------------------------------------------------------------------
12440
12489
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -12499,7 +12548,7 @@ spec:
12499
12548
  command:
12500
12549
  - /opt/app-root/src/run-role.sh
12501
12550
  - suite_uninstall
12502
- image: quay.io/ibmmas/cli:13.15.0
12551
+ image: quay.io/ibmmas/cli:13.15.2
12503
12552
  imagePullPolicy: $(params.image_pull_policy)
12504
12553
  # --------------------------------------------------------------------------------
12505
12554
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -12569,7 +12618,7 @@ spec:
12569
12618
  command:
12570
12619
  - /opt/app-root/src/run-role.sh
12571
12620
  - suite_upgrade
12572
- image: quay.io/ibmmas/cli:13.15.0
12621
+ image: quay.io/ibmmas/cli:13.15.2
12573
12622
  imagePullPolicy: $(params.image_pull_policy)
12574
12623
  # --------------------------------------------------------------------------------
12575
12624
  # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -12636,12 +12685,12 @@ spec:
12636
12685
  command:
12637
12686
  - /opt/app-root/src/run-role.sh
12638
12687
  - suite_verify
12639
- image: quay.io/ibmmas/cli:13.15.0
12688
+ image: quay.io/ibmmas/cli:13.15.2
12640
12689
  imagePullPolicy: $(params.image_pull_policy)
12641
12690
 
12642
12691
  # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
12643
12692
  - name: suite-post-verify
12644
- image: quay.io/ibmmas/cli:13.15.0
12693
+ image: quay.io/ibmmas/cli:13.15.2
12645
12694
  imagePullPolicy: $(params.image_pull_policy)
12646
12695
  script: |
12647
12696
  #!/usr/bin/env bash
@@ -12769,7 +12818,7 @@ spec:
12769
12818
  command:
12770
12819
  - /opt/app-root/src/run-role.sh
12771
12820
  - turbonomic
12772
- image: quay.io/ibmmas/cli:13.15.0
12821
+ image: quay.io/ibmmas/cli:13.15.2
12773
12822
  imagePullPolicy: $(params.image_pull_policy)
12774
12823
  # --------------------------------------------------------------------------------
12775
12824
  # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -12850,7 +12899,7 @@ spec:
12850
12899
  # IBM User Data Services (UDS)
12851
12900
  # -------------------------------------------------------------------------
12852
12901
  - name: uds
12853
- image: quay.io/ibmmas/cli:13.15.0
12902
+ image: quay.io/ibmmas/cli:13.15.2
12854
12903
  imagePullPolicy: $(params.image_pull_policy)
12855
12904
  workingDir: /workspace/configs
12856
12905
  command:
@@ -12913,7 +12962,7 @@ spec:
12913
12962
  # IBM Data Reporter Operator (DRO)
12914
12963
  # -------------------------------------------------------------------------
12915
12964
  - name: dro
12916
- image: quay.io/ibmmas/cli:13.15.0
12965
+ image: quay.io/ibmmas/cli:13.15.2
12917
12966
  imagePullPolicy: $(params.image_pull_policy)
12918
12967
  workingDir: /workspace/configs
12919
12968
  command:
@@ -12999,7 +13048,7 @@ spec:
12999
13048
  description: "The value to set"
13000
13049
  steps:
13001
13050
  - name: update-configmap
13002
- image: quay.io/ibmmas/cli:13.15.0
13051
+ image: quay.io/ibmmas/cli:13.15.2
13003
13052
  command:
13004
13053
  - /opt/app-root/src/update-configmap.sh
13005
13054
  env:
@@ -13046,7 +13095,7 @@ spec:
13046
13095
 
13047
13096
  steps:
13048
13097
  - name: wait-for-configmap
13049
- image: quay.io/ibmmas/cli:13.15.0
13098
+ image: quay.io/ibmmas/cli:13.15.2
13050
13099
  command:
13051
13100
  - /opt/app-root/src/wait-for-configmap.sh
13052
13101
  env:
@@ -13127,7 +13176,7 @@ spec:
13127
13176
 
13128
13177
  steps:
13129
13178
  - name: wait-for-configmap
13130
- image: quay.io/ibmmas/cli:13.15.0
13179
+ image: quay.io/ibmmas/cli:13.15.2
13131
13180
  command:
13132
13181
  - /opt/app-root/src/wait-for-configmap.sh
13133
13182
  env:
@@ -13187,7 +13236,7 @@ spec:
13187
13236
 
13188
13237
  steps:
13189
13238
  - name: wait
13190
- image: quay.io/ibmmas/cli:13.15.0
13239
+ image: quay.io/ibmmas/cli:13.15.2
13191
13240
  command:
13192
13241
  - /opt/app-root/src/wait-for-tekton.sh
13193
13242
  env:
@@ -13561,12 +13610,16 @@ spec:
13561
13610
  - name: mongo_provider
13562
13611
  type: string
13563
13612
  default: aws
13613
+ - name: mongodb_action
13614
+ type: string
13564
13615
  - name: aws_docdb_instance_number
13565
13616
  type: string
13566
13617
  default: 3
13567
13618
  - name: kafka_provider
13568
13619
  type: string
13569
13620
  default: aws
13621
+ - name: kafka_action
13622
+ type: string
13570
13623
  - name: mas_instance_id
13571
13624
  type: string
13572
13625
 
@@ -13685,6 +13738,10 @@ spec:
13685
13738
  workspaces:
13686
13739
  - name: configs
13687
13740
  workspace: configs
13741
+ when:
13742
+ - input: "$(params.mongodb_action)"
13743
+ operator: notin
13744
+ values: [""]
13688
13745
 
13689
13746
  # Deprovision Kafka
13690
13747
  # -------------------------------------------------------------------------
@@ -13718,6 +13775,10 @@ spec:
13718
13775
  workspaces:
13719
13776
  - name: configs
13720
13777
  workspace: configs
13778
+ when:
13779
+ - input: "$(params.kafka_action)"
13780
+ operator: notin
13781
+ values: [""]
13721
13782
 
13722
13783
  # Deprovision COS
13723
13784
  # -------------------------------------------------------------------------
@@ -13846,12 +13907,16 @@ spec:
13846
13907
  - name: mongo_provider
13847
13908
  type: string
13848
13909
  default: aws
13910
+ - name: mongodb_action
13911
+ type: string
13849
13912
  - name: aws_docdb_instance_number
13850
13913
  type: string
13851
13914
  default: 3
13852
13915
  - name: kafka_provider
13853
13916
  type: string
13854
13917
  default: aws
13918
+ - name: kafka_action
13919
+ type: string
13855
13920
  - name: mas_instance_id
13856
13921
  type: string
13857
13922
 
@@ -13950,6 +14015,10 @@ spec:
13950
14015
  workspaces:
13951
14016
  - name: configs
13952
14017
  workspace: configs
14018
+ when:
14019
+ - input: "$(params.mongodb_action)"
14020
+ operator: notin
14021
+ values: [""]
13953
14022
 
13954
14023
  # Deprovision Kafka
13955
14024
  # -------------------------------------------------------------------------
@@ -13983,6 +14052,10 @@ spec:
13983
14052
  workspaces:
13984
14053
  - name: configs
13985
14054
  workspace: configs
14055
+ when:
14056
+ - input: "$(params.kafka_action)"
14057
+ operator: notin
14058
+ values: [""]
13986
14059
 
13987
14060
  # Deprovision COS
13988
14061
  # -------------------------------------------------------------------------
@@ -19915,6 +19988,8 @@ spec:
19915
19988
  - name: aws_docdb_engine_version
19916
19989
  type: string
19917
19990
  default: 4.0.0
19991
+ - name: mongodb_action
19992
+ type: string
19918
19993
 
19919
19994
  - name: kafka_provider
19920
19995
  type: string
@@ -20017,6 +20092,10 @@ spec:
20017
20092
  workspaces:
20018
20093
  - name: configs
20019
20094
  workspace: configs
20095
+ when:
20096
+ - input: "$(params.mongodb_action)"
20097
+ operator: notin
20098
+ values: [""]
20020
20099
 
20021
20100
  # 2. Kafka
20022
20101
  # -------------------------------------------------------------------------
@@ -20197,6 +20276,8 @@ spec:
20197
20276
  - name: aws_docdb_engine_version
20198
20277
  type: string
20199
20278
  default: 4.0.0
20279
+ - name: mongodb_action
20280
+ type: string
20200
20281
 
20201
20282
  - name: kafka_provider
20202
20283
  type: string
@@ -20279,6 +20360,10 @@ spec:
20279
20360
  workspaces:
20280
20361
  - name: configs
20281
20362
  workspace: configs
20363
+ when:
20364
+ - input: "$(params.mongodb_action)"
20365
+ operator: notin
20366
+ values: [""]
20282
20367
 
20283
20368
  # 2. Kafka
20284
20369
  # -------------------------------------------------------------------------
@@ -20774,6 +20859,8 @@ spec:
20774
20859
  - name: source_path
20775
20860
  type: string
20776
20861
  default: ""
20862
+ - name: git_commit_msg
20863
+ type: string
20777
20864
  - name: mas_channel
20778
20865
  type: string
20779
20866
  - name: mas_operationalmode
@@ -20892,6 +20979,8 @@ spec:
20892
20979
  value: $(params.source_github_repo)
20893
20980
  - name: source_path
20894
20981
  value: $(params.source_path)
20982
+ - name: git_commit_msg
20983
+ value: $(params.git_commit_msg)
20895
20984
  - name: mas_channel
20896
20985
  value: $(params.mas_channel)
20897
20986
  - name: mas_operationalmode
@@ -20976,6 +21065,8 @@ spec:
20976
21065
  - name: source_path
20977
21066
  type: string
20978
21067
  default: ""
21068
+ - name: git_commit_msg
21069
+ type: string
20979
21070
  - name: mas_channel
20980
21071
  type: string
20981
21072
  - name: mas_operationalmode
@@ -21074,6 +21165,8 @@ spec:
21074
21165
  value: $(params.source_github_repo)
21075
21166
  - name: source_path
21076
21167
  value: $(params.source_path)
21168
+ - name: git_commit_msg
21169
+ value: $(params.git_commit_msg)
21077
21170
  - name: mas_channel
21078
21171
  value: $(params.mas_channel)
21079
21172
  - name: mas_operationalmode
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mas-cli
3
- Version: 13.15.0
3
+ Version: 13.15.2
4
4
  Summary: Python Admin CLI for Maximo Application Suite
5
5
  Home-page: https://github.com/ibm-mas/cli
6
6
  Author: David Parker
@@ -1,5 +1,5 @@
1
- mas/cli/__init__.py,sha256=d5fEq15Ii8KqTVuoV6zmBlRIOGGOHhT4DdO7hRovduQ,527
2
- mas/cli/cli.py,sha256=P6b53sZT_sUdlpPGZ2-g8ryfSw1Pau3wyvSsFdcvz1M,18175
1
+ mas/cli/__init__.py,sha256=r3_WheuyAOK5__Qf7SDCLCI8N1jVPjgOc5hg9bNz_58,527
2
+ mas/cli/cli.py,sha256=nuIgd3ic-128KvprsimtPRf_S-KTniRl82AhfaXU5yI,18175
3
3
  mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
4
4
  mas/cli/gencfg.py,sha256=p38Ss_ooiNHOZTJT8l0YxDaEaPwD4ZXgxEbW-S9YLNY,3311
5
5
  mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
@@ -17,7 +17,7 @@ mas/cli/install/settings/kafkaSettings.py,sha256=r1uK-IApqB9IQiSNt_8sP0wa4FPJcXU
17
17
  mas/cli/install/settings/manageSettings.py,sha256=whoAT3B-qQjLD6SaS_9OEmmIvbSXbcI9m-wCDyu4alI,17853
18
18
  mas/cli/install/settings/mongodbSettings.py,sha256=UVt8vMLNpgyewlcymSystIhICnHsd0uoM9qpgezVjGg,2567
19
19
  mas/cli/install/settings/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
20
- mas/cli/templates/ibm-mas-tekton.yaml,sha256=IJJ28kPgLa_7sswqHQBeFXmVlGldnF5p7TMp6TE5ua8,872265
20
+ mas/cli/templates/ibm-mas-tekton.yaml,sha256=xJz1ZPGlZ4X69x5Xy0P0f4gQ2qfErjsN-dSogAddnVk,875935
21
21
  mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
22
22
  mas/cli/templates/suite_mongocfg.yml.j2,sha256=WrgJUfGyvfaRIHjY5VR_zLZ5irTpV5khKNq76ejIxKU,1606
23
23
  mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
@@ -99,8 +99,8 @@ mas/cli/update/argParser.py,sha256=oOIXzB_rsI2p3og_5X5SFt_g7LURyEdLxZeiGCKq1nU,4
99
99
  mas/cli/upgrade/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
100
100
  mas/cli/upgrade/app.py,sha256=EuEZayc0nw9kA6Hz8M9Mv7uk0hgmspJSZCYhNEfCECk,6428
101
101
  mas/cli/upgrade/argParser.py,sha256=pqzNDSHy6l13JunHWQLyOI-NFnDGDoVJ_HM07FLYJSc,2033
102
- mas_cli-13.15.0.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
103
- mas_cli-13.15.0.dist-info/METADATA,sha256=opUneMYddIDLJyUxn0BcZ-5bVegUo402GGq-LI6AiKU,2259
104
- mas_cli-13.15.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
105
- mas_cli-13.15.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
106
- mas_cli-13.15.0.dist-info/RECORD,,
102
+ mas_cli-13.15.2.data/scripts/mas-cli,sha256=BbibIX0psLEOZdcNaFcO4mJvStD0pKLAe-p-NwVTrBs,3439
103
+ mas_cli-13.15.2.dist-info/METADATA,sha256=AVHC3AZxh4aR7tsgE5vPEda1XXA5nOK2nkW2yFX_0gQ,2259
104
+ mas_cli-13.15.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
105
+ mas_cli-13.15.2.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
106
+ mas_cli-13.15.2.dist-info/RECORD,,