From 5cff0a382327ceaa09d12c3d5836e0a3b7b3bc7a Mon Sep 17 00:00:00 2001
From: Daniel Panzella <daniel.panzella@wandb.com>
Date: Fri, 10 Jan 2025 15:38:31 -0800
Subject: [PATCH] fix: we dont want the username and password for bufstream at
 the moment (#305)

Co-authored-by: Zachary Blasczyk <77289967+zacharyblasczyk@users.noreply.github.com>
---
 charts/operator-wandb/Chart.lock                              | 4 ++--
 charts/operator-wandb/Chart.yaml                              | 2 +-
 charts/operator-wandb/charts/app/templates/_helpers.tpl       | 2 ++
 .../charts/flat-run-fields-updater/templates/_helpers.tpl     | 2 ++
 charts/operator-wandb/values.yaml                             | 2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/operator-wandb/Chart.lock b/charts/operator-wandb/Chart.lock
index b2941e87..8931ef10 100644
--- a/charts/operator-wandb/Chart.lock
+++ b/charts/operator-wandb/Chart.lock
@@ -56,5 +56,5 @@ dependencies:
 - name: wandb-base
   repository: file://../wandb-base
   version: 0.1.1
-digest: sha256:3c02029e1921428d7f45866291a8c42b79894505ee47864c54f34fcd847b2793
-generated: "2024-12-19T11:00:55.672581+05:30"
+digest: sha256:94b5b6f58c500f9f5fbbd39b2f059d90dccd091d5e03c4cb838a9440b5e7953f
+generated: "2025-01-10T15:30:55.673078-08:00"
diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
index 9c27c015..b6f43f83 100644
--- a/charts/operator-wandb/Chart.yaml
+++ b/charts/operator-wandb/Chart.yaml
@@ -59,7 +59,7 @@ dependencies:
   - name: bufstream
     version: "0.3.1"
     repository: file://charts/bufstream
-    condition: bufstream.install
+    condition: global.beta.bufstream.enabled
   - name: otel
     version: "*.*.*"
     repository: file://charts/otel
diff --git a/charts/operator-wandb/charts/app/templates/_helpers.tpl b/charts/operator-wandb/charts/app/templates/_helpers.tpl
index 16f12ced..f81688cf 100644
--- a/charts/operator-wandb/charts/app/templates/_helpers.tpl
+++ b/charts/operator-wandb/charts/app/templates/_helpers.tpl
@@ -123,6 +123,8 @@ app deployments.
 {{- define "app.runUpdateShadowTopic" -}}
 {{- if .Values.global.pubSub.enabled -}}
 pubsub:/{{ .Values.global.pubSub.project }}/{{ .Values.global.pubSub.runUpdateShadowTopic }}
+{{- else if .Values.global.beta.bufstream.enabled -}}
+kafka://$(KAFKA_BROKER_HOST):$(KAFKA_BROKER_PORT)/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?producer_batch_bytes=1048576&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)&replication_factor=3
 {{- else -}}
 kafka://$(KAFKA_CLIENT_USER):$(KAFKA_CLIENT_PASSWORD)@$(KAFKA_BROKER_HOST):$(KAFKA_BROKER_PORT)/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?producer_batch_bytes=1048576&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)&replication_factor=3
 {{- end -}}
diff --git a/charts/operator-wandb/charts/flat-run-fields-updater/templates/_helpers.tpl b/charts/operator-wandb/charts/flat-run-fields-updater/templates/_helpers.tpl
index 26f504fa..f66ec965 100644
--- a/charts/operator-wandb/charts/flat-run-fields-updater/templates/_helpers.tpl
+++ b/charts/operator-wandb/charts/flat-run-fields-updater/templates/_helpers.tpl
@@ -109,6 +109,8 @@ Create the name of the service account to use
 {{- define "flat-run-fields-updater.runUpdateShadowQueue" -}}
 {{- if .Values.global.pubSub.enabled -}}
 pubsub:/{{ .Values.global.pubSub.project }}/{{ .Values.global.pubSub.runUpdateShadowTopic }}/{{ .Values.pubSub.subscription }}
+{{- else if .Values.global.beta.bufstream.enabled -}}
+kafka://$(KAFKA_BROKER_HOST):$(KAFKA_BROKER_PORT)/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?producer_batch_bytes=1048576&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)&replication_factor=3
 {{- else -}}
 kafka://$(KAFKA_CLIENT_USER):$(KAFKA_CLIENT_PASSWORD)@$(KAFKA_BROKER_HOST):9092/$(KAFKA_TOPIC_RUN_UPDATE_SHADOW_QUEUE)?consumer_group_id=default-group&num_partitions=$(KAFKA_RUN_UPDATE_SHADOW_QUEUE_NUM_PARTITIONS)&replication_factor=3
 {{- end -}}
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
index df71ce0d..2070f9c0 100644
--- a/charts/operator-wandb/values.yaml
+++ b/charts/operator-wandb/values.yaml
@@ -176,6 +176,8 @@ global:
   beta:
     glue:
       enabled: false
+    bufstream:
+      enabled: false
 
   executor:
     enabled: false