Merge branch 'main' into annirudh/FUSE

wandb · Dec 17, 2024 · b3e3189 · b3e3189
2 parents 794e72e + c32c39c
commit b3e3189
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/charts/operator-wandb/charts/app/templates/deployment.yaml b/charts/operator-wandb/charts/app/templates/deployment.yaml
@@ -305,7 +305,6 @@ spec:
 
             {{- include "app.extraEnv" (dict "global" $.Values.global "local" .Values) | nindent 12 }}
             {{- include "wandb.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }}
-          {{- if .healthCheckEnabled }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -328,7 +327,6 @@ spec:
             preStop:
               exec:
                 command: ["sleep", "25"]
-          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:

diff --git a/charts/operator-wandb/templates/_redis.tpl b/charts/operator-wandb/templates/_redis.tpl
@@ -5,7 +5,7 @@ Return name of secret where redis information is stored
 {{- if .Values.global.redis.secret.secretName -}}
   {{ .Values.global.redis.secret.secretName }}
 {{- else -}}
-  {{- print .Release.Name "-redis" -}}
+  {{- print .Release.Name "-redis-secret" -}}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/operator-wandb/templates/redis.yaml b/charts/operator-wandb/templates/redis.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "{{ .Release.Name }}-redis-secret"
+  name: "{{ $secretName }}"
   labels:
     {{- include "wandb.commonLabels" . | nindent 4 }}
 data:
@@ -20,4 +20,4 @@ metadata:
     {{- include "wandb.commonLabels" . | nindent 4 }}
 data:
   REDIS_PORT: "{{ include "wandb.redis.port" . }}"
-  REDIS_HOST: "{{ include "wandb.redis.host" . }}"
+  REDIS_HOST: "{{ include "wandb.redis.host" . }}"