diff --git a/charts/doit-eks-lens/Chart.yaml b/charts/doit-eks-lens/Chart.yaml index a6bf6fe..89cea5c 100644 --- a/charts/doit-eks-lens/Chart.yaml +++ b/charts/doit-eks-lens/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: doit-eks-lens description: A Helm chart for DoiT EKS lens type: application -version: 1.0.5 +version: 1.0.6 appVersion: "0.0.1" diff --git a/charts/doit-eks-lens/templates/doit-kube-state-metrics.yaml b/charts/doit-eks-lens/templates/doit-kube-state-metrics.yaml index 58e3db5..55764b5 100644 --- a/charts/doit-eks-lens/templates/doit-kube-state-metrics.yaml +++ b/charts/doit-eks-lens/templates/doit-kube-state-metrics.yaml @@ -216,6 +216,10 @@ spec: tolerations: {{ toYaml .Values.kubeStateMetrics.tolerations | indent 8 }} {{- end }} + {{- if .Values.kubeStateMetrics.nodeSelector }} + nodeSelector: +{{ toYaml .Values.kubeStateMetrics.nodeSelector | indent 8 }} + {{- end }} --- apiVersion: v1 kind: Service diff --git a/charts/doit-eks-lens/templates/doit-otelcol.yaml b/charts/doit-eks-lens/templates/doit-otelcol.yaml index 1f46c72..dec8907 100644 --- a/charts/doit-eks-lens/templates/doit-otelcol.yaml +++ b/charts/doit-eks-lens/templates/doit-otelcol.yaml @@ -410,8 +410,10 @@ spec: successThreshold: 1 timeoutSeconds: 1 name: otelcol + {{- if .Values.collector.otelcol.resources }} resources: {{ toYaml .Values.collector.otelcol.resources | nindent 10 }} + {{- end }} volumeMounts: - mountPath: /conf name: doit-collector-config @@ -429,4 +431,8 @@ spec: {{- if .Values.collector.tolerations }} tolerations: {{ toYaml .Values.collector.tolerations | indent 8 }} + {{- end }} + {{- if .Values.collector.nodeSelector }} + nodeSelector: +{{ toYaml .Values.collector.nodeSelector | indent 8 }} {{- end }} \ No newline at end of file diff --git a/charts/doit-eks-lens/values.yaml b/charts/doit-eks-lens/values.yaml index edc53f9..52a5971 100644 --- a/charts/doit-eks-lens/values.yaml +++ b/charts/doit-eks-lens/values.yaml @@ -8,6 +8,7 @@ kubeStateMetrics: tag: v2.9.2 ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] + nodeSelector: {} collector: otelcol: @@ -22,13 +23,14 @@ collector: check_interval: 1s limit_percentage: 70 spike_limit_percentage: 30 + ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + resources: {} env: - # - name: "GOMEMLIMIT" - # value: "2750MiB" + # - name: "GOMEMLIMIT" + # value: "2750MiB" ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] - ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - resources: {} + nodeSelector: {} metricsDeploymentId: xxxxxxxxx s3_bucket: "doitintl-eks-metrics-xxxxxxxx-us-east-1"