From b7d162d001014bb7ef3c530b30c6bea2cb8d8f3f Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Tue, 16 Jul 2024 12:34:33 +0200 Subject: [PATCH] fix: adjust metrics server settings for OpenShift --- config/samples/all_enabled_openshift.yaml | 10 ++++++++++ tests/values.yaml | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/config/samples/all_enabled_openshift.yaml b/config/samples/all_enabled_openshift.yaml index 0e7bbf8..bd15ae2 100644 --- a/config/samples/all_enabled_openshift.yaml +++ b/config/samples/all_enabled_openshift.yaml @@ -29,6 +29,16 @@ spec: ## Set the enabled flag to true for enabling metrics-server. ## This is required before enabling autoscaling unless you have an existing metrics-server in the cluster. enabled: true + apiService: + create: false + global: + compatibility: + ## Compatibility adaptations for Openshift + ## + openshift: + ## @param global.compatibility.openshift.adaptSecurityContext Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) + ## + adaptSecurityContext: auto ## Configure kube-prometheus-stack ## ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml diff --git a/tests/values.yaml b/tests/values.yaml index b8d3c5b..74d9ccf 100644 --- a/tests/values.yaml +++ b/tests/values.yaml @@ -71,6 +71,14 @@ metrics-server: enabled: true apiService: create: false + global: + compatibility: + ## Compatibility adaptations for Openshift + ## + openshift: + ## @param global.compatibility.openshift.adaptSecurityContext Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) + ## + adaptSecurityContext: auto telegraf-operator: enabled: true