Skip to content

Commit 54ec518

Browse files
author
Nivedithaa Mahendran
committed
update
1 parent 0ac919e commit 54ec518

5 files changed

Lines changed: 21 additions & 7 deletions

File tree

.secrets.baseline

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/",
44
"lines": null
55
},
6-
"generated_at": "2026-05-04T19:55:23Z",
6+
"generated_at": "2026-05-04T20:14:43Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -472,15 +472,15 @@
472472
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
473473
"is_secret": false,
474474
"is_verified": false,
475-
"line_number": 673,
475+
"line_number": 677,
476476
"type": "Secret Keyword",
477477
"verified_result": null
478478
},
479479
{
480480
"hashed_secret": "c2a0bd05f2ebbdd505fc3ed2981c36a5b6050ea8",
481481
"is_secret": false,
482482
"is_verified": false,
483-
"line_number": 766,
483+
"line_number": 770,
484484
"type": "Secret Keyword",
485485
"verified_result": null
486486
}
@@ -736,7 +736,7 @@
736736
"hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd",
737737
"is_secret": false,
738738
"is_verified": false,
739-
"line_number": 25,
739+
"line_number": 27,
740740
"type": "Secret Keyword",
741741
"verified_result": null
742742
}

image/cli/mascli/functions/gitops_suite

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ AWS Secrets Manager Configuration (Required):
2727
2828
MongoDb Provider Selection (Required):
2929
--mongo-provider ${COLOR_YELLOW}MONGODB_PROVIDER${TEXT_RESET} The mongodb provider to install ('aws' or 'yaml')
30+
--mongo-action ${COLOR_YELLOW}MONGO_ACTION${TEXT_RESET} The mongo action ('install' or 'uninstall', optional)
3031
--mongo-reset-instance-password ${COLOR_YELLOW}MONGO_RESET_INSTANCE_PASSWORD${TEXT_RESET} Reset MongoDB instance password (true/false, default: false)
3132
--mongo-update-instance-secret ${COLOR_YELLOW}MONGO_UPDATE_INSTANCE_MONGO_SECRET${TEXT_RESET} Update MongoDB instance secret (true/false, default: false)
3233
@@ -235,6 +236,9 @@ function gitops_suite_noninteractive() {
235236
--mongo-provider)
236237
export MONGODB_PROVIDER=$1 && shift
237238
;;
239+
--mongo-action)
240+
export MONGO_ACTION=$1 && shift
241+
;;
238242

239243
# SLS
240244
--sls-channel)

image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-sls.yaml.j2

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@ ibm_sls:
88
sls_channel: {{ SLS_CHANNEL }}
99
sls_entitlement_file: <path:{{ SECRETS_PATH }}:{{ SECRET_KEY_LICENSE_FILE }}>
1010
ibm_entitlement_key: <path:{{ SECRETS_PATH }}:{{ SECRET_KEY_IBM_ENTITLEMENT }}>
11-
{%- if MONGO_UPDATE_INSTANCE_MONGO_SECRET == "true" %}
11+
{%- if MONGO_UPDATE_INSTANCE_MONGO_SECRET == "true" and MONGO_ACTION == "install" %}
1212
mongo:
1313
mongo_reset_instance_password: {{ MONGO_RESET_INSTANCE_PASSWORD }}
1414
mongo_update_instance_mongo_secret: {{ MONGO_UPDATE_INSTANCE_MONGO_SECRET }}
1515
{%- endif %}
16-
# aws docdb
1716
mongodb_provider: "{{ MONGODB_PROVIDER }}"
17+
{%- if not (MONGODB_PROVIDER == "yaml" and MONGO_ACTION == "install") %}
18+
# aws docdb - only used when NOT MongoDB Atlas
1819
user_action: "{{ USER_ACTION }}"
1920
docdb_host: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_DOCDB_HOST }}>"
2021
docdb_port: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_DOCDB_PORT }}>"
2122
docdb_master_username: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_DOCDB_MASTER_USERNAME }}>"
2223
docdb_master_password: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_DOCDB_MASTER_PASSWORD }}>"
2324
docdb_master_info: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_DOCDB_MASTER_INFO }}>"
25+
{%- endif %}
2426
sls_mongo_username: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_MONGO_USERNAME }}>"
2527
sls_mongo_password: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_MONGO_PASSWORD }}>"
2628

tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,8 @@ spec:
404404
value: $(params.mas_instance_id)
405405
- name: mongo_provider
406406
value: $(params.mongo_provider)
407+
- name: mongo_action
408+
value: $(params.mongo_action)
407409
- name: mongo_reset_instance_password
408410
value: $(params.mongo_reset_instance_password)
409411
- name: mongo_update_instance_mongo_secret

tekton/src/tasks/gitops/gitops-suite.yml.j2

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ spec:
2222
- name: mongo_provider
2323
type: string
2424
default: aws
25+
- name: mongo_action
26+
type: string
27+
default: ""
2528
- name: mongo_reset_instance_password
2629
type: string
2730
default: "false"
@@ -201,6 +204,8 @@ spec:
201204
value: $(params.mas_instance_id)
202205
- name: MONGODB_PROVIDER
203206
value: $(params.mongo_provider)
207+
- name: MONGO_ACTION
208+
value: $(params.mongo_action)
204209
- name: MONGO_RESET_INSTANCE_PASSWORD
205210
value: $(params.mongo_reset_instance_password)
206211
- name: MONGO_UPDATE_INSTANCE_MONGO_SECRET
@@ -392,7 +397,8 @@ spec:
392397
--github-org $GITHUB_ORG \
393398
--github-repo $GITHUB_REPO \
394399
--git-branch $GIT_BRANCH \
395-
--mas-wipe-mongo-data "$MAS_WIPE_MONGO_DATA"
400+
--mas-wipe-mongo-data "$MAS_WIPE_MONGO_DATA" \
401+
--mongo-action "$MONGO_ACTION"
396402

397403
exit $?
398404
command:

0 commit comments

Comments
 (0)