resolve comments to remove topology from prometheus, stackdriver & da…

…emonset
wandb · Dec 18, 2024 · 10a0c21 · 10a0c21
1 parent db5c8d6
commit 10a0c21
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 36 deletions.
diff --git a/charts/operator-wandb/Chart.lock b/charts/operator-wandb/Chart.lock
@@ -31,7 +31,7 @@ dependencies:
   version: 25.3.5
 - name: etcd
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 10.6.1
+  version: 10.7.1
 - name: bufstream
   repository: file://charts/bufstream
   version: 0.3.1
@@ -56,5 +56,5 @@ dependencies:
 - name: wandb-base
   repository: file://../wandb-base
   version: 0.1.1
-digest: sha256:1eb284a2d6588f3e3d90293abb99f0e25b02fd62a87758f023d809879a82e31d
-generated: "2024-12-06T11:08:12.69179-08:00"
+digest: sha256:3c02029e1921428d7f45866291a8c42b79894505ee47864c54f34fcd847b2793
+generated: "2024-12-18T18:29:20.054295+05:30"
diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: operator-wandb
 description: A Helm chart for deploying W&B to Kubernetes
 type: application
-version: 0.21.8
+version: 0.21.9
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/otel/charts/agent/templates/deamonset.yaml b/charts/operator-wandb/charts/otel/charts/agent/templates/deamonset.yaml
@@ -43,9 +43,6 @@ spec:
       {{- include "wandb.nodeSelector" . | nindent 6 }}
       {{- include "wandb.priorityClassName" . | nindent 6 }}
       {{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
-      {{- if .Values.topologySpreadConstraints.enabled }}
-        {{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "otelAgent.labels" .))) | nindent 6 }}
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/charts/operator-wandb/charts/otel/values.yaml b/charts/operator-wandb/charts/otel/values.yaml
@@ -1,8 +1,6 @@
 daemonset:
   install: true
   mode: "daemonset"
-  topologySpreadConstraints:
-    enabled: false
   presets:
     receivers:
       hostMetrics: true

diff --git a/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/deployment.yaml b/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/deployment.yaml
@@ -41,9 +41,6 @@ spec:
       {{- include "wandb.nodeSelector" . | nindent 6 }}
       {{- include "wandb.priorityClassName" . | nindent 6 }}
       {{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
-      {{- if .Values.topologySpreadConstraints.enabled }}
-        {{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "mysql-exporter.labels" .))) | nindent 6 }}
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/values.yaml b/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/values.yaml
@@ -19,9 +19,6 @@ pod:
   labels: {}
   annotations: {}
 
-topologySpreadConstraints:
-  enabled: false
-
 common:
   labels: {}
 

diff --git a/charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/deployment.yaml b/charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/deployment.yaml
@@ -41,9 +41,6 @@ spec:
       {{- include "wandb.nodeSelector" . | nindent 6 }}
       {{- include "wandb.priorityClassName" . | nindent 6 }}
       {{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
-      {{- if .Values.topologySpreadConstraints.enabled }}
-        {{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "redis-exporter.labels" .))) | nindent 6 }}
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/charts/operator-wandb/charts/prometheus/charts/redis-exporter/values.yaml b/charts/operator-wandb/charts/prometheus/charts/redis-exporter/values.yaml
@@ -19,9 +19,6 @@ pod:
   labels: {}
   annotations: {}
 
-topologySpreadConstraints:
-  enabled: false
-
 common:
   labels: {}
 

diff --git a/charts/operator-wandb/charts/stackdriver/templates/deployment.yaml b/charts/operator-wandb/charts/stackdriver/templates/deployment.yaml
@@ -35,9 +35,6 @@ spec:
       {{- include "wandb.nodeSelector" . | nindent 6 }}
       {{- include "wandb.priorityClassName" . | nindent 6 }}
       {{- include "wandb.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
-      {{- if .Values.topologySpreadConstraints.enabled }}
-        {{- include "wandb.topologySpreadConstraints" (dict "matchLabels" (fromYaml (include "stackdriver.labels" .))) | nindent 6 }}
-      {{- end }}
     spec:
       containers:
         - name: {{ .Chart.Name }}

diff --git a/charts/operator-wandb/charts/stackdriver/values.yaml b/charts/operator-wandb/charts/stackdriver/values.yaml
@@ -101,9 +101,6 @@ container:
     readOnlyRootFilesystem: false
     privileged: false
 
-topologySpreadConstraints:
-  enabled: false
-
 deployment: {}
 
 serviceAccount:

diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -326,13 +326,9 @@ prometheus:
 
   redis-exporter:
     install: true
-    topologySpreadConstraints:
-      enabled: false
 
   mysql-exporter:
     install: true
-    topologySpreadConstraints:
-      enabled: false
 
 stackdriver:
   install: false
@@ -342,18 +338,15 @@ stackdriver:
       prometheus.io/port: "9255"
       prometheus.io/path: "/metrics"
       prometheus.io/scheme: http
-  topologySpreadConstraints:
-    enabled: false
 
 otel:
   install: true
+
   # Consider deploying with a deployment rather than a daemonset to avoid
   # redundant metrics. In setups where both are scraping the same endpoints,
   # this redundancy occurs as both scrape the same points.
   daemonset:
-    install: false
-    topologySpreadConstraints:
-      enabled: false
+    install: true
 
   # By default, we use only the daemonset which, along with the Prometheus
   # receiver, gathers most necessary metrics.