Skip to content
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

Jump to bottom

Change .Values.*.image from map to string #15

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

Change .Values.*.image from map to string #15

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
df15781
change the value type of image to a string while keeping it backwards…
mskdenigma Nov 27, 2024
9699346
removed backwards compatibility as templating for both is difficult
mskdenigma Nov 27, 2024
8d0c308
bring back newlines
mskdenigma Nov 27, 2024
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
3 changes: 2 additions & 1 deletion charts/doit-eks-lens/templates/doit-kube-state-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ spec:
fieldPath: spec.nodeName
- name: KUBERNETES_CLUSTER_DOMAIN
value: "cluster.local"
image: {{ .Values.kubeStateMetrics.image.repository }}:{{ .Values.kubeStateMetrics.image.tag }}
image: {{ .Values.kubeStateMetrics.image }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -236,3 +236,4 @@ spec:
- name: http-metrics
port: 8080
{{ end }}

5 changes: 3 additions & 2 deletions charts/doit-eks-lens/templates/doit-otelcol.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ spec:
- name: {{ .name }}
value: {{ .value }}
{{- end }}
image: {{ .Values.collector.otelcol.image.repository }}:{{ .Values.collector.otelcol.image.tag }}
image: {{ .Values.collector.otelcol.image }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -435,4 +435,5 @@ spec:
{{- if .Values.collector.nodeSelector }}
nodeSelector:
{{ toYaml .Values.collector.nodeSelector | indent 8 }}
{{- end }}
{{- end }}

8 changes: 2 additions & 6 deletions charts/doit-eks-lens/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@ k8s_platform: eks
kubeStateMetrics:
install: true
replicas: 1
image:
repository: registry.k8s.io/kube-state-metrics/kube-state-metrics
tag: v2.9.2
image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.9.2"
## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
tolerations: []
nodeSelector: {}

collector:
otelcol:
replicas: 1
image:
repository: otel/opentelemetry-collector-contrib
tag: 0.83.0
image: "otel/opentelemetry-collector-contrib:0.83.0"
kubeStateMetrics:
endpoint: "kube-state-metrics:8080"
## Ref: https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md
Expand Down