Set parquet

wandb · Oct 12, 2023 · ab4eb77 · ab4eb77
1 parent 48e8d90
commit ab4eb77
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 38 deletions.
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.10.19
+version: 0.10.20
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/app/templates/deployment.yaml b/charts/operator-wandb/charts/app/templates/deployment.yaml
@@ -101,16 +101,12 @@ spec:
             - name: MYSQL
               value: "mysql://$(MYSQL_USER):$(MYSQL_PASSWORD)@$(MYSQL_HOST):$(MYSQL_PORT)/$(MYSQL_DATABASE)"
 
-            # - name: WEAVE_SERVICE
-            #   value: "{{ .Release.Name }}-weave:9994"
-            # - name: PARQUET_ENABLED
-            #   value: "true"
-            # - name: WEAVE_SERVICE
-            #   value: "{{ .Release.Name }}-weave:9994"
-            # - name: PARQUET_HOST
-            #   value: "http://{{ .Release.Name }}-parquet:8087"
-            # - name: PARQUET_ENABLED
-            #   value: "true"
+            - name: WEAVE_SERVICE
+              value: "{{ .Release.Name }}-weave:9994"
+            - name: PARQUET_HOST
+              value: "http://{{ .Release.Name }}-parquet:8087"
+            - name: PARQUET_ENABLED
+              value: "true"
 
             {{- if ne (include "wandb.redis.password" .) "" }}
             - name: REDIS_PASSWORD

diff --git a/charts/operator-wandb/charts/parquet/templates/deployment.yaml b/charts/operator-wandb/charts/parquet/templates/deployment.yaml
@@ -55,12 +55,39 @@ spec:
               containerPort: 8087
               protocol: TCP
           env:
+            - name: HOST
+              value: "{{ .Values.global.host }}"
+
+            {{- if .Values.extraCors }}
+            - name: GORILLA_CORS_ORIGINS
+              value: "{{ join "," .Values.extraCors }}"
+            {{- end }}
+
             - name: ONLY_SERVICE
               value: gorilla-parquet
 
             - name: LOGGING_ENABLED
               value: 'true'
 
+            - name: MYSQL_PORT
+              value: "{{ include "wandb.mysql.port" . }}"
+            - name: MYSQL_HOST
+              value: "{{ include "wandb.mysql.host" . }}"
+            - name: MYSQL_DATABASE
+              value: "{{ include "wandb.mysql.database" . }}"
+            - name: MYSQL_USER
+              value: "{{ include "wandb.mysql.user" . }}"
+            - name: MYSQL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "wandb.mysql.passwordSecret" . }}
+                  key:  MYSQL_PASSWORD
+            - name: MYSQL
+              value: "mysql://$(MYSQL_USER):$(MYSQL_PASSWORD)@$(MYSQL_HOST):$(MYSQL_PORT)/$(MYSQL_DATABASE)"
+
+            - name: WEAVE_SERVICE
+              value: "{{ .Release.Name }}-weave:9994"
+
             {{- if ne (include "wandb.redis.password" .) "" }}
             - name: REDIS_PASSWORD
               valueFrom:
@@ -75,27 +102,24 @@ spec:
             - name: REDIS
               value: "{{ include "parquet.redis" . | trim }}"
 
-            - name: BUCKET
-              value: "{{ include "parquet.bucket" . }}"
-
-            - name: GORILLA_ACTIVITY_STORE_CACHE_ADDRESS
-              value: "{{ include "parquet.redis" . | trim }}"
-
-            - name: MYSQL_PORT
-              value: "{{ include "wandb.mysql.port" . }}"
-            - name: MYSQL_HOST
-              value: "{{ include "wandb.mysql.host" . }}"
-            - name: MYSQL_DATABASE
-              value: "{{ include "wandb.mysql.database" . }}"
-            - name: MYSQL_USER
-              value: "{{ include "wandb.mysql.user" . }}"
-            - name: MYSQL_PASSWORD
+            - name: LICENSE
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "wandb.mysql.passwordSecret" . }}
-                  key:  MYSQL_PASSWORD
-            - name: MYSQL
-              value: "mysql://$(MYSQL_USER):$(MYSQL_PASSWORD)@$(MYSQL_HOST):$(MYSQL_PORT)/$(MYSQL_DATABASE)"
+                  name: {{ include "app.fullname" . }}-config
+                  key: LICENSE
+                  optional: true
+            - name: GORILLA_LICENSE
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "app.fullname" . }}-config
+                  key: LICENSE
+                  optional: true
+            - name: GORILLA_SETTINGS_CACHE
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "app.fullname" . }}-config
+                  key: LICENSE
+                  optional: true
 
             - name: BUCKET
               value: "{{ include "parquet.bucket" . }}"
@@ -105,6 +129,12 @@ spec:
               value: {{ .Values.global.bucket.region }}
             - name: AWS_S3_KMS_ID
               value: "{{ .Values.global.bucket.kmsKey }}"
+            - name: AZURE_STORAGE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ include "wandb.bucket.secret" . }}"
+                  key: ACCESS_KEY
+                  optional: true
 
             {{- include "parquet.extraEnv" (dict "global" .Values.global "local" .Values) | nindent 12 }}
             {{- include "wandb.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }}

diff --git a/charts/operator-wandb/charts/parquet/templates/service.yaml b/charts/operator-wandb/charts/parquet/templates/service.yaml
@@ -1,12 +1,11 @@
-{{- if .Values.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "weave.fullname" . }}
+  name: {{ include "parquet.fullname" . }}
   labels:
     {{- include "wandb.commonLabels" . | nindent 4 }}
-    {{- include "weave.labels" . | nindent 4 }}
-    {{- include "weave.commonLabels" . | nindent 4 }}
+    {{- include "parquet.labels" . | nindent 4 }}
+    {{- include "parquet.commonLabels" . | nindent 4 }}
     {{- if .Values.service.labels -}}
     {{-   toYaml .Values.service.labels | nindent 4 }}
     {{- end }}
@@ -21,5 +20,4 @@ spec:
       protocol: TCP
       name: parquet
   selector:
-    {{- include "weave.labels" . | nindent 4 }}
-{{- end }}
+    {{- include "parquet.labels" . | nindent 4 }}
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -86,7 +86,7 @@ ingress:
     email: [email protected]
 
 parquet:
-  install: false
+  install: true
   image:
     repository: wandb/local
     tag: latest
@@ -98,7 +98,7 @@ app:
     tag: latest
 
 weave:
-  install: false
+  install: true
   # # azurefile, filestore
   # provider: ""
   storageClass: ""