Skip to content

[minor] Support Adoption Metrics Reporting Flag in GitOps Automation #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[minor] Support Adoption Metrics Reporting Flag in GitOps Automation #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb0f7e1
[patch] Add adoption metrics reporting flag for gitops
ashleytate614 Oct 29, 2025
33f24db
[patch] update .secrets.baseline
ashleytate614 Oct 30, 2025
04d04eb
[patch] Update again
ashleytate614 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-10-24T15:33:48Z",
"generated_at": "2025-10-30T18:25:34Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -444,7 +444,7 @@
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
"is_secret": false,
"is_verified": false,
"line_number": 545,
"line_number": 553,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -700,7 +700,7 @@
"hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd",
"is_secret": false,
"is_verified": false,
"line_number": 23,
"line_number": 24,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
8 changes: 8 additions & 0 deletions image/cli/mascli/functions/gitops_suite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ IBM Maximo Application Suite:
--extensions ${COLOR_YELLOW}EXTENSIONS${TEXT_RESET} To enable JAVA or 3rd party code extensions
--enhanced-dr ${COLOR_YELLOW}ENHANCED_DR${TEXT_RESET} To enable Enhanced Disaster Recovery
--is-non-shared-cluster ${COLOR_YELLOW}IS_NON_SHARED_CLUSTER${TEXT_RESET} To enable Non shared cluster
--mas-report-adoption-metrics ${COLOR_YELLOW}MAS_REPORT_ADOPTION_METRICS${TEXT_RESET} To enable adoption metrics reporting (optional, defaults to true)
--suite-spec-additional-properties-yaml ${COLOR_YELLOW}SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML${TEXT_RESET} Additional properties to be set in Suite CR spec
--suite-spec-settings-additional-properties-yaml ${COLOR_YELLOW}SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML${TEXT_RESET} Additional properties to be set in Suite CR spec.settings

Expand Down Expand Up @@ -136,6 +137,9 @@ function gitops_suite_noninteractive() {

# cert-manager namespace, in case redhat default value is cert-manager
export CERT_MANAGER_NAMESPACE=${CERT_MANAGER_NAMESPACE:-"cert-manager"}

# Enable adoption metrics reporting by default
export MAS_REPORT_ADOPTION_METRICS=${MAS_REPORT_ADOPTION_METRICS:-"true"}

while [[ $# -gt 0 ]]
do
Expand Down Expand Up @@ -226,6 +230,9 @@ function gitops_suite_noninteractive() {
--mas-wipe-mongo-data)
export MAS_WIPE_MONGO_DATA=$1 && shift
;;
--mas-report-adoption-metrics)
export MAS_REPORT_ADOPTION_METRICS=$1 && shift
;;
--suite-spec-additional-properties-yaml)
export SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML=$1 && shift
;;
Expand Down Expand Up @@ -528,6 +535,7 @@ function gitops_suite() {
echo_reset_dim "Enhanced Disaster Recovery ................. ${COLOR_MAGENTA}${ENHANCED_DR}"
echo_reset_dim "Non shared cluster ......................... ${COLOR_MAGENTA}${IS_NON_SHARED_CLUSTER}"
echo_reset_dim "Java or 3rd Party Code Extensions .......... ${COLOR_MAGENTA}${EXTENSIONS}"
echo_reset_dim "Report adoption metrics .................... ${COLOR_MAGENTA}${MAS_REPORT_ADOPTION_METRICS}"
echo_reset_dim "Suite Spec Additional Properties ........... ${COLOR_MAGENTA}${SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML}"
echo_reset_dim "Suite Spec Settings Additional Properties .. ${COLOR_MAGENTA}${SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML}"
if [[ -n "$INTERNAL_CERT_AUTHORITY" ]]; then
Expand Down
1 change: 1 addition & 0 deletions image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ibm_mas_suite:
cert_manager_namespace: "{{ CERT_MANAGER_NAMESPACE }}"
ibm_entitlement_key: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_IBM_ENTITLEMENT }}>"
domain: "{{ DOMAIN }}"
mas_report_adoption_metrics: "{{ MAS_REPORT_ADOPTION_METRICS }}"

{%- if DNS_PROVIDER is defined and DNS_PROVIDER !='' %}
# suite dns
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/pipelines/gitops/gitops-mas-instance.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ spec:
- name: mas_wipe_mongo_data
type: string
default: "false"
- name: mas_report_adoption_metrics
type: string
default: "true"
- name: mas_pod_template_yaml
type: string
default: ""
Expand Down Expand Up @@ -430,6 +433,8 @@ spec:
value: $(params.mas_pod_template_yaml)
- name: mas_wipe_mongo_data
value: $(params.mas_wipe_mongo_data)
- name: mas_report_adoption_metrics
value: $(params.mas_report_adoption_metrics)
- name: suite_spec_additional_properties_yaml
value: $(params.suite_spec_additional_properties_yaml)
- name: suite_spec_settings_additional_properties_yaml
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/tasks/gitops/gitops-suite.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ spec:
- name: mas_wipe_mongo_data
type: string
default: "false"
- name: mas_report_adoption_metrics
type: string
default: "true"
- name: suite_spec_additional_properties_yaml
type: string
default: ""
Expand Down Expand Up @@ -235,6 +238,8 @@ spec:
value: $(params.mas_pod_template_yaml)
- name: MAS_WIPE_MONGO_DATA
value: $(params.mas_wipe_mongo_data)
- name: MAS_REPORT_ADOPTION_METRICS
value: $(params.mas_report_adoption_metrics)
- name: SUITE_SPEC_ADDITIONAL_PROPERTIES_YAML
value: $(params.suite_spec_additional_properties_yaml)
- name: SUITE_SPEC_SETTINGS_ADDITIONAL_PROPERTIES_YAML
Expand Down