Skip to content

Commit 10a0c21

Browse files
committed
resolve comments to remove topology from prometheus, stackdriver & daemonset
1 parent db5c8d6 commit 10a0c21

File tree

11 files changed

+6
-36
lines changed

11 files changed

+6
-36
lines changed

Diff for: charts/operator-wandb/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131
version: 25.3.5
3232
- name: etcd
3333
repository: oci://registry-1.docker.io/bitnamicharts
34-
version: 10.6.1
34+
version: 10.7.1
3535
- name: bufstream
3636
repository: file://charts/bufstream
3737
version: 0.3.1
@@ -56,5 +56,5 @@ dependencies:
5656
- name: wandb-base
5757
repository: file://../wandb-base
5858
version: 0.1.1
59-
digest: sha256:1eb284a2d6588f3e3d90293abb99f0e25b02fd62a87758f023d809879a82e31d
60-
generated: "2024-12-06T11:08:12.69179-08:00"
59+
digest: sha256:3c02029e1921428d7f45866291a8c42b79894505ee47864c54f34fcd847b2793
60+
generated: "2024-12-18T18:29:20.054295+05:30"

Diff for: charts/operator-wandb/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: operator-wandb
33
description: A Helm chart for deploying W&B to Kubernetes
44
type: application
5-
version: 0.21.8
5+
version: 0.21.9
66
appVersion: 1.0.0
77
icon: https://wandb.ai/logo.svg
88

Diff for: charts/operator-wandb/charts/otel/charts/agent/templates/deamonset.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ spec:
4343
{{- include "wandb.nodeSelector" . | nindent 6 }}
4444
{{- include "wandb.priorityClassName" . | nindent 6 }}
4545
{{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
46-
{{- if .Values.topologySpreadConstraints.enabled }}
47-
{{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "otelAgent.labels" .))) | nindent 6 }}
48-
{{- end }}
4946
containers:
5047
- name: {{ .Chart.Name }}
5148
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

Diff for: charts/operator-wandb/charts/otel/values.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
daemonset:
22
install: true
33
mode: "daemonset"
4-
topologySpreadConstraints:
5-
enabled: false
64
presets:
75
receivers:
86
hostMetrics: true

Diff for: charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/deployment.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ spec:
4141
{{- include "wandb.nodeSelector" . | nindent 6 }}
4242
{{- include "wandb.priorityClassName" . | nindent 6 }}
4343
{{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
44-
{{- if .Values.topologySpreadConstraints.enabled }}
45-
{{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "mysql-exporter.labels" .))) | nindent 6 }}
46-
{{- end }}
4744
containers:
4845
- name: {{ .Chart.Name }}
4946
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

Diff for: charts/operator-wandb/charts/prometheus/charts/mysql-exporter/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ pod:
1919
labels: {}
2020
annotations: {}
2121

22-
topologySpreadConstraints:
23-
enabled: false
24-
2522
common:
2623
labels: {}
2724

Diff for: charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/deployment.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ spec:
4141
{{- include "wandb.nodeSelector" . | nindent 6 }}
4242
{{- include "wandb.priorityClassName" . | nindent 6 }}
4343
{{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
44-
{{- if .Values.topologySpreadConstraints.enabled }}
45-
{{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "redis-exporter.labels" .))) | nindent 6 }}
46-
{{- end }}
4744
containers:
4845
- name: {{ .Chart.Name }}
4946
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

Diff for: charts/operator-wandb/charts/prometheus/charts/redis-exporter/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ pod:
1919
labels: {}
2020
annotations: {}
2121

22-
topologySpreadConstraints:
23-
enabled: false
24-
2522
common:
2623
labels: {}
2724

Diff for: charts/operator-wandb/charts/stackdriver/templates/deployment.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ spec:
3535
{{- include "wandb.nodeSelector" . | nindent 6 }}
3636
{{- include "wandb.priorityClassName" . | nindent 6 }}
3737
{{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
38-
{{- if .Values.topologySpreadConstraints.enabled }}
39-
{{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "stackdriver.labels" .))) | nindent 6 }}
40-
{{- end }}
4138
spec:
4239
containers:
4340
- name: {{ .Chart.Name }}

Diff for: charts/operator-wandb/charts/stackdriver/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ container:
101101
readOnlyRootFilesystem: false
102102
privileged: false
103103

104-
topologySpreadConstraints:
105-
enabled: false
106-
107104
deployment: {}
108105

109106
serviceAccount:

Diff for: charts/operator-wandb/values.yaml

+2-9
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,9 @@ prometheus:
326326

327327
redis-exporter:
328328
install: true
329-
topologySpreadConstraints:
330-
enabled: false
331329

332330
mysql-exporter:
333331
install: true
334-
topologySpreadConstraints:
335-
enabled: false
336332

337333
stackdriver:
338334
install: false
@@ -342,18 +338,15 @@ stackdriver:
342338
prometheus.io/port: "9255"
343339
prometheus.io/path: "/metrics"
344340
prometheus.io/scheme: http
345-
topologySpreadConstraints:
346-
enabled: false
347341

348342
otel:
349343
install: true
344+
350345
# Consider deploying with a deployment rather than a daemonset to avoid
351346
# redundant metrics. In setups where both are scraping the same endpoints,
352347
# this redundancy occurs as both scrape the same points.
353348
daemonset:
354-
install: false
355-
topologySpreadConstraints:
356-
enabled: false
349+
install: true
357350

358351
# By default, we use only the daemonset which, along with the Prometheus
359352
# receiver, gathers most necessary metrics.

0 commit comments

Comments
 (0)