fix: Make bufstream hostname configurable for weave-trace

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.40.0
+version: 0.40.1
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

charts/operator-wandb/templates/_queues.tpl

@@ -61,7 +61,10 @@ Return the kafka broker url port
 {{- if .Values.kafka.install -}}
 {{ printf "%s-%s" .Release.Name "kafka" }}
 {{- else if .Values.bufstream.install -}}
-bufstream
+{{- $bufstreamNamespace := default .Release.Namespace .Values.bufstream.namespaceOverride -}}
+{{ printf "bufstream.%s.svc.cluster.local" $bufstreamNamespace }}
+{{- else -}}
+bufstream.bufstream.svc.cluster.local
 {{- end -}}
 {{- else -}}
 {{ .Values.global.kafka.brokerHost }}

charts/operator-wandb/templates/weave-trace.yaml

@@ -23,6 +23,6 @@ data:
   WEAVE_ENABLE_EVALUATE_MODEL_WORKER: {{ (get  .Values "weave-evaluate-model-worker").install | quote }}
   WEAVE_TRACE_SERVER_BASE_URL: "{{ .Values.global.host }}/traces"
   WANDB_INTERNAL_SERVICE_TOKEN_SECRET_NAME: "weave-worker-auth"
-  KAFKA_BROKER_HOST: "bufstream.bufstream.svc.cluster.local"
-  KAFKA_BROKER_PORT: "9092"
+  KAFKA_BROKER_HOST: "{{ include "wandb.kafka.brokerHost" . }}"
+  KAFKA_BROKER_PORT: "{{ include "wandb.kafka.brokerPort" . }}"
 

test-configs/operator-wandb/__snapshots__/default.snap

@@ -5,7 +5,7 @@ kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
   name: chartsnap-redis
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -243,15 +243,15 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: prometheus
   name: chartsnap-prometheus-server
-  namespace: default
+  namespace: operator-system
 ---
 # Source: operator-wandb/charts/redis/templates/master/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: false
 metadata:
   name: chartsnap-redis-master
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -264,7 +264,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   annotations:
-    meta.helm.sh/release-namespace: "default"
+    meta.helm.sh/release-namespace: "operator-system"
     meta.helm.sh/release-name: "chartsnap"
   labels:
     app: chartsnap-reloader
@@ -274,7 +274,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     helm.sh/chart: '###CHART_VERSION###'
   name: chartsnap-reloader
-  namespace: default
+  namespace: operator-system
 ---
 # Source: operator-wandb/charts/weave/templates/serviceaccount.yaml
 apiVersion: v1
@@ -718,7 +718,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: prometheus
   name: chartsnap-prometheus-server
-  namespace: default
+  namespace: operator-system
 data:
   allow-snippet-annotations: "false"
   alerting_rules.yml: |
@@ -1045,7 +1045,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: chartsnap-redis-configuration
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -1078,7 +1078,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: chartsnap-redis-health
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -1186,7 +1186,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: chartsnap-redis-scripts
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -1320,7 +1320,7 @@ data:
   AUTH_SERVICE: "chartsnap-app:8080"
   OPERATOR_NAMESPACE: "default"
   RELEASE_NAME: "chartsnap"
-  RELEASE_NAMESPACE: "default"
+  RELEASE_NAMESPACE: "operator-system"
   PROMETHEUS_SERVER: "http://chartsnap-prometheus-server"
   BANNERS: "{}"
 ---
@@ -1548,7 +1548,7 @@ metadata:
     global-common-label: "global-common-label-value"
     helm.sh/chart: '###CHART_VERSION###'
 data:
-  KAFKA_BROKER_HOST: ""
+  KAFKA_BROKER_HOST: "bufstream.bufstream.svc.cluster.local"
   KAFKA_BROKER_PORT: "9092"
   KAFKA_CLIENT_USER: ""
   KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE: "chartsnap-run-updates-shadow"
@@ -1722,7 +1722,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: prometheus
   name: chartsnap-prometheus-server
-  namespace: default
+  namespace: operator-system
 spec:
   accessModes:
   - ReadWriteOnce
@@ -1800,7 +1800,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: chartsnap-otel-daemonset
-  namespace: default
+  namespace: operator-system
   labels:
     global-common-label: "global-common-label-value"
     global-common-label: "global-common-label-value"
@@ -1907,7 +1907,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: chartsnap-console
-  namespace: default
+  namespace: operator-system
 roleRef:
   kind: ClusterRole
   name: chartsnap-console
@@ -1934,7 +1934,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: chartsnap-otel-daemonset
-  namespace: default
+  namespace: operator-system
 ---
 # Source: operator-wandb/charts/prometheus/charts/instance/templates/clusterrolebinding.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1952,7 +1952,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: chartsnap-prometheus-server
-  namespace: default
+  namespace: operator-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -2013,7 +2013,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   annotations:
-    meta.helm.sh/release-namespace: "default"
+    meta.helm.sh/release-namespace: "operator-system"
     meta.helm.sh/release-name: "chartsnap"
   labels:
     app: chartsnap-reloader
@@ -2023,7 +2023,7 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     helm.sh/chart: '###CHART_VERSION###'
   name: chartsnap-reloader-role
-  namespace: default
+  namespace: operator-system
 rules:
 - apiGroups:
   - ""
@@ -2088,7 +2088,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: chartsnap-app
-  namespace: default
+  namespace: operator-system
 roleRef:
   kind: Role
   name: chartsnap-app
@@ -2099,7 +2099,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   annotations:
-    meta.helm.sh/release-namespace: "default"
+    meta.helm.sh/release-namespace: "operator-system"
     meta.helm.sh/release-name: "chartsnap"
   labels:
     app: chartsnap-reloader
@@ -2109,15 +2109,15 @@ metadata:
     app.kubernetes.io/managed-by: "Helm"
     helm.sh/chart: '###CHART_VERSION###'
   name: chartsnap-reloader-role-binding
-  namespace: default
+  namespace: operator-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: chartsnap-reloader-role
 subjects:
 - kind: ServiceAccount
   name: chartsnap-reloader
-  namespace: default
+  namespace: operator-system
 ---
 # Source: operator-wandb/charts/app/templates/service.yaml
 apiVersion: v1
@@ -2307,7 +2307,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: prometheus
   name: chartsnap-prometheus-server
-  namespace: default
+  namespace: operator-system
 spec:
   ports:
   - name: http
@@ -2390,7 +2390,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: chartsnap-redis-headless
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -2413,7 +2413,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: chartsnap-redis-master
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -3824,7 +3824,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: prometheus
   name: chartsnap-prometheus-server
-  namespace: default
+  namespace: operator-system
 spec:
   selector:
     matchLabels:
@@ -3920,7 +3920,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    meta.helm.sh/release-namespace: "default"
+    meta.helm.sh/release-namespace: "operator-system"
     meta.helm.sh/release-name: "chartsnap"
   labels:
     app: chartsnap-reloader
@@ -3933,7 +3933,7 @@ metadata:
     version: v1.3.0
     helm.sh/chart: '###CHART_VERSION###'
   name: chartsnap-reloader
-  namespace: default
+  namespace: operator-system
 spec:
   replicas: 1
   revisionHistoryLimit: 2
@@ -4327,7 +4327,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: chartsnap-redis-master
-  namespace: "default"
+  namespace: "operator-system"
   labels:
     app.kubernetes.io/instance: chartsnap
     app.kubernetes.io/managed-by: Helm
@@ -4832,7 +4832,7 @@ data:
   pre_upgrade.sh: |
     #!/bin/bash
 
-    NAMESPACE="default"
+    NAMESPACE="operator-system"
     RELEASE="chartsnap"
     DEPLOYMENTS="app parquet weave weave-trace"
 
@@ -4854,7 +4854,7 @@ data:
   post_upgrade.sh: |
     #!/bin/bash
 
-    NAMESPACE="default"
+    NAMESPACE="operator-system"
     RELEASE="chartsnap"
     DEPLOYMENTS="app parquet weave weave-trace"
 
@@ -4951,7 +4951,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: chartsnap-app-rename-post-hook
-  namespace: default
+  namespace: operator-system
 roleRef:
   kind: Role
   name: chartsnap-app-rename-post-hook
@@ -4977,7 +4977,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: chartsnap-app-rename-pre-hook
-  namespace: default
+  namespace: operator-system
 roleRef:
   kind: Role
   name: chartsnap-app-rename-pre-hook