From 1596b01764fc89a1f7ad71fe40afb511ccea2e45 Mon Sep 17 00:00:00 2001
From: Eric Wollesen <eric@tidepool.org>
Date: Fri, 12 Sep 2025 11:11:01 -0600
Subject: [PATCH 1/3] set a default container in deployments

How often have you ssh'd into a prod box only to end up on the linkerd
container? It's happened to me too many times.

I found this nifty annotation that can alleviate the problem... Unless
you're trying to get to the linkerd container, in which case you're
back to using `-c linkderd`.
---
 charts/tidepool/charts/auth/templates/1-deployment.yaml        | 3 ++-
 charts/tidepool/charts/blip/templates/1-deployment.yaml        | 3 ++-
 charts/tidepool/charts/blob/templates/1-deployment.yaml        | 3 ++-
 .../tidepool/charts/clinic-worker/templates/1-deployment.yaml  | 3 ++-
 charts/tidepool/charts/clinic/templates/1-deployment.yaml      | 3 ++-
 charts/tidepool/charts/data/templates/1-deployment.yaml        | 3 ++-
 charts/tidepool/charts/devices/templates/1-deployment.yaml     | 3 ++-
 charts/tidepool/charts/export/templates/1-deployment.yaml      | 3 ++-
 charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml  | 3 ++-
 charts/tidepool/charts/highwater/templates/1-deployment.yaml   | 3 ++-
 charts/tidepool/charts/hydrophone/templates/1-deployment.yaml  | 3 ++-
 charts/tidepool/charts/jellyfish/templates/1-deployment.yaml   | 3 ++-
 charts/tidepool/charts/mailer/templates/1-deployment.yaml      | 3 ++-
 charts/tidepool/charts/messageapi/templates/1-deployment.yaml  | 3 ++-
 .../tidepool/charts/prescription/templates/1-deployment.yaml   | 3 ++-
 charts/tidepool/charts/seagull/templates/1-deployment.yaml     | 3 ++-
 charts/tidepool/charts/shoreline/templates/1-deployment.yaml   | 3 ++-
 charts/tidepool/charts/task/templates/1-deployment.yaml        | 3 ++-
 .../tidepool/charts/tidewhisperer/templates/1-deployment.yaml  | 3 ++-
 charts/tidepool/charts/tools/templates/1-deployment.yaml       | 3 ++-
 charts/tidepool/charts/uploader/templates/1-deployment.yaml    | 3 ++-
 21 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml
index 388db0d38..65c22644e 100644
--- a/charts/tidepool/charts/auth/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: auth
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: auth
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/blip/templates/1-deployment.yaml b/charts/tidepool/charts/blip/templates/1-deployment.yaml
index e607d8804..b177f32bc 100644
--- a/charts/tidepool/charts/blip/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blip/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: blip
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: blip
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index 0c8cd42f9..797c361d5 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -22,8 +22,9 @@ spec:
   strategy: {}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: blob
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:
diff --git a/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml b/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml
index fdd52a16d..25f5b624f 100644
--- a/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: clinic-worker
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: clinic-worker
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/clinic/templates/1-deployment.yaml b/charts/tidepool/charts/clinic/templates/1-deployment.yaml
index 95e9ec33a..8eae6eede 100644
--- a/charts/tidepool/charts/clinic/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/clinic/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: clinic
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: clinic
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/data/templates/1-deployment.yaml b/charts/tidepool/charts/data/templates/1-deployment.yaml
index d330b19dc..fe36ae675 100644
--- a/charts/tidepool/charts/data/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/data/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: data
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: data
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/devices/templates/1-deployment.yaml b/charts/tidepool/charts/devices/templates/1-deployment.yaml
index 72085d69c..bb49e0163 100644
--- a/charts/tidepool/charts/devices/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/devices/templates/1-deployment.yaml
@@ -21,8 +21,9 @@ spec:
         app: devices
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: devices
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/export/templates/1-deployment.yaml b/charts/tidepool/charts/export/templates/1-deployment.yaml
index 38527c86a..173adeb36 100644
--- a/charts/tidepool/charts/export/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/export/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: export
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: export
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml b/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
index 9aef0ba85..f5059416a 100644
--- a/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: gatekeeper
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: gatekeeper
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/highwater/templates/1-deployment.yaml b/charts/tidepool/charts/highwater/templates/1-deployment.yaml
index 634ea60bf..dd06be3f3 100644
--- a/charts/tidepool/charts/highwater/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/highwater/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: highwater
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: highwater
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml b/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml
index 079192003..d40eae318 100644
--- a/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml
@@ -22,8 +22,9 @@ spec:
   replicas: {{ .Values.deployment.replicas }}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: hydrophone
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:
diff --git a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
index 70eb90fc7..11152e308 100644
--- a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
@@ -22,8 +22,9 @@ spec:
   strategy: {}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: jellyfish
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:
diff --git a/charts/tidepool/charts/mailer/templates/1-deployment.yaml b/charts/tidepool/charts/mailer/templates/1-deployment.yaml
index 4d920e37f..9009fbee0 100644
--- a/charts/tidepool/charts/mailer/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/mailer/templates/1-deployment.yaml
@@ -28,8 +28,9 @@ spec:
         app: mailer
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: mailer
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/messageapi/templates/1-deployment.yaml b/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
index e58496972..4eb0cea4a 100644
--- a/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: message-api
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: messageapi
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/prescription/templates/1-deployment.yaml b/charts/tidepool/charts/prescription/templates/1-deployment.yaml
index 2f7f1af44..4b65d9464 100644
--- a/charts/tidepool/charts/prescription/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/prescription/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: prescription
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: prescription
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/seagull/templates/1-deployment.yaml b/charts/tidepool/charts/seagull/templates/1-deployment.yaml
index 9c111832a..2c7e946aa 100644
--- a/charts/tidepool/charts/seagull/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/seagull/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: seagull
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: seagull
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/shoreline/templates/1-deployment.yaml b/charts/tidepool/charts/shoreline/templates/1-deployment.yaml
index ec1cb8e42..d3f97fea6 100644
--- a/charts/tidepool/charts/shoreline/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/shoreline/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: shoreline
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: shoreline
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/task/templates/1-deployment.yaml b/charts/tidepool/charts/task/templates/1-deployment.yaml
index ede20d2d1..ecdb5cc1e 100644
--- a/charts/tidepool/charts/task/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/task/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: task
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: task
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
index acb9c78d7..f2a47389c 100644
--- a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: tide-whisperer
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: tide-whisperer
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/tools/templates/1-deployment.yaml b/charts/tidepool/charts/tools/templates/1-deployment.yaml
index d6453ba0a..302f14b58 100644
--- a/charts/tidepool/charts/tools/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/tools/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: tools
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: tools
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/uploader/templates/1-deployment.yaml b/charts/tidepool/charts/uploader/templates/1-deployment.yaml
index 2ef1d8657..739817c3c 100644
--- a/charts/tidepool/charts/uploader/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/uploader/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: uploader
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: uploader
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:

From 80f2ded22deaa67bbe80f9e294ff77a372096bc8 Mon Sep 17 00:00:00 2001
From: Todd Kazakov <todd.kazakov@gmail.com>
Date: Tue, 4 Nov 2025 13:14:14 +0200
Subject: [PATCH 2/3] Use Tidepool's image of plotly/orca (#330)

---
 .../tidepool/charts/plotly-orca/templates/0-deployment.yaml  | 5 +++++
 charts/tidepool/charts/plotly-orca/values.yaml               | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml b/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml
index 681cc76d0..3de27b3b4 100644
--- a/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml
+++ b/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml
@@ -22,6 +22,11 @@ spec:
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
+{{- $imagePullSecrets := (.Values.deployment).imagePullSecrets | default ((.Values.global).deployment).imagePullSecrets -}}
+{{- if $imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml $imagePullSecrets | nindent 6 }}
+{{- end }}
       containers:
       - name: plotly-orca
         image: {{ .Values.deployment.image | quote }}
diff --git a/charts/tidepool/charts/plotly-orca/values.yaml b/charts/tidepool/charts/plotly-orca/values.yaml
index 3b9ef6348..4b7e1b0a7 100644
--- a/charts/tidepool/charts/plotly-orca/values.yaml
+++ b/charts/tidepool/charts/plotly-orca/values.yaml
@@ -1,3 +1,3 @@
 deployment:
-  image: quay.io/plotly/orca
+  image: tidepool/plotly-orca:latest
   replicas: 1
\ No newline at end of file

From 8622e2ee37b3b8a26472ff3bddf2511797124fdb Mon Sep 17 00:00:00 2001
From: Todd Kazakov <todd.kazakov@gmail.com>
Date: Tue, 4 Nov 2025 13:18:45 +0200
Subject: [PATCH 3/3] Tidepool 0.22.0 (#332)

---
 charts/tidepool/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tidepool/Chart.yaml b/charts/tidepool/Chart.yaml
index 266de277d..0db2e74ca 100644
--- a/charts/tidepool/Chart.yaml
+++ b/charts/tidepool/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Tidepool
 name: tidepool
-version: 0.21.0
+version: 0.22.0
 maintainers:
   - name: Todd Kazakov
     email: todd@tidepool.org