From baf3acc25b55662b9d6078395e63b773cafdd48a Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Tue, 11 Jun 2024 15:03:10 +0200 Subject: [PATCH] fix: remove duplicated image key from metrics server settings --- deploy/helm/sumologic/README.md | 2 ++ deploy/helm/sumologic/values.yaml | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index e70550598..9ae08b410 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -202,6 +202,8 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `metrics-server.apiService.create` | Specifies whether the v1beta1.metrics.k8s.io API service should be created. | `true` | | `metrics-server.extraArgs` | Extra arguments to pass to metrics-server on start up. | `["--kubelet-insecure-tls=true", "--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname"]` | | `metrics-server.image.pullSecrets` | Pull secrets for metrics-server images. For more information on using Kubernetes secrets with container registries please refer to [Creating a Secret with a Docker config at kubernetes.io](https://kubernetes.io/docs/concepts/containers/images/#creating-a-secret-with-a-docker-config). | `Nil` | +| `metrics-server.image.registry` | Registry for metrics-server image. | `public.ecr.aws` | +| `metrics-server.image.repository` | Repository for metrics-server image. | `sumologic/metrics-server` | | `kube-prometheus-stack.kubeTargetVersionOverride` | Provide a target gitVersion of K8S, in case .Capabilites.KubeVersion is not available (e.g. helm template). Changing this may break Sumo Logic apps. | `Nil` | | `kube-prometheus-stack.enabled` | Flag to control deploying Prometheus Operator Helm sub-chart. | `true` | | `kube-prometheus-stack.fullnameOverride` | Used to override the chart's full name. | `Nil` | diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index a2ddc6824..23ba6690a 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -765,6 +765,13 @@ metrics-server: image: registry: public.ecr.aws repository: sumologic/metrics-server + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - imagepullsecret + ## 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: false @@ -776,14 +783,6 @@ metrics-server: extraArgs: - --kubelet-insecure-tls=true - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - ## Optionally specify image options for metrics-server - # image: - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - imagepullsecret ## Configure kube-prometheus-stack ## ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml