Skip to content

Commit 100f88c

Browse files
nammnfealebenpae
authored andcommitted
Fix openshift merge (#4141)
# Summary - Recent helm chart change added the option to control clusterRole installation via helm option. - Thus openshift tests are failing, it tries to install clusterRoles multiple times ## Proof of Work WIll merge and then check on master ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [x] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you checked for release_note changes? ## Reminder (Please remove this when merging) - Please try to Approve or Reject Changes the PR, keep PRs in review as short as possible - Our Short Guide for PRs: [Link](REDACTED) - Remember the following Communication Standards - use comment prefixes for clarity: * **blocking**: Must be addressed before approval. * **follow-up**: Can be addressed in a later PR or ticket. * **q**: Clarifying question. * **nit**: Non-blocking suggestions. * **note**: Side-note, non-actionable. Example: Praise * --> no prefix is considered a question
1 parent b83ce21 commit 100f88c

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

scripts/dev/contexts/e2e_mdb_openshift_ubi_cloudqa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export ecr_registry_needs_auth=ecr-registry
1313
export MANAGED_SECURITY_CONTEXT="true"
1414
export ALWAYS_REMOVE_TESTING_NAMESPACE="true"
1515
export ops_manager_version="cloud_qa"
16-
export MDB_OPERATOR_TELEMETRY_COLLECTION_CLUSTERS_ENABLED="false"
16+
export MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION="false"
1717

1818
export CUSTOM_MDB_VERSION=6.0.16
1919

scripts/dev/contexts/e2e_openshift_static_mdb_ubi_cloudqa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export ecr_registry_needs_auth=ecr-registry
1313
export MANAGED_SECURITY_CONTEXT="true"
1414
export ALWAYS_REMOVE_TESTING_NAMESPACE="true"
1515
export ops_manager_version="cloud_qa"
16-
export MDB_OPERATOR_TELEMETRY_COLLECTION_CLUSTERS_ENABLED="false"
16+
export MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION="false"
1717

1818
export CUSTOM_MDB_VERSION=6.0.16
1919

scripts/funcs/operator_deployment

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ get_operator_helm_values() {
3636
"operator.telemetry.collection.frequency=${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}"
3737
)
3838

39+
if [[ "${MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION:-}" != "" ]]; then
40+
config+=("operator.telemetry.installClusterRole=${MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION}")
41+
fi
42+
3943
if [[ "${MDB_OPERATOR_TELEMETRY_ENABLED:-true}" == "false" ]]; then
4044
config+=("operator.telemetry.enabled=false")
4145
config+=("operator.telemetry.collection.clusters.enabled=false")

0 commit comments

Comments
 (0)