From 2f3548b5e4c3eaa13f7e36601a689bd27a7c7fbc Mon Sep 17 00:00:00 2001
From: koralowiec <arkadiusz.kalandyk@appsilon.com>
Date: Wed, 15 Jan 2025 15:00:09 +0000
Subject: [PATCH 1/2] feat(workbench): add annotations option for session cm

---
 charts/rstudio-workbench/templates/configmap-session.yaml | 4 ++++
 charts/rstudio-workbench/values.yaml                      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/charts/rstudio-workbench/templates/configmap-session.yaml b/charts/rstudio-workbench/templates/configmap-session.yaml
index f71a28d9f..4d642c02f 100644
--- a/charts/rstudio-workbench/templates/configmap-session.yaml
+++ b/charts/rstudio-workbench/templates/configmap-session.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  annotations:
+    {{- tpl ( toYaml .Values.config.annotations.session ) . | nindent 4 }}
   name: {{ include "rstudio-workbench.fullname" . }}-session
   namespace: {{ $.Release.Namespace }}
 data:
@@ -44,6 +46,8 @@ stringData:
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  annotations:
+    {{- tpl ( toYaml .Values.config.annotations.session ) . | nindent 4 }}
   name: {{ include "rstudio-workbench.fullname" . }}-session
   namespace: {{ $targetNamespace }}
 data:
diff --git a/charts/rstudio-workbench/values.yaml b/charts/rstudio-workbench/values.yaml
index cecc98b73..88299bf29 100644
--- a/charts/rstudio-workbench/values.yaml
+++ b/charts/rstudio-workbench/values.yaml
@@ -417,6 +417,10 @@ config:
     # @default -- 0644
     pam: 0644
 
+  annotations:
+    # annotations for ConfigMap created for sessions
+    session: {}
+
   # -- a map of session-scoped config files. Mounted to `/mnt/session-configmap/rstudio/` on both server and session, by default.
   session:
     repos.conf:

From a34bc84e43090c1c587dc9b4567ac2b54377c924 Mon Sep 17 00:00:00 2001
From: koralowiec <arkadiusz.kalandyk@appsilon.com>
Date: Wed, 15 Jan 2025 15:09:59 +0000
Subject: [PATCH 2/2] docs(workbench): update README

---
 charts/rstudio-workbench/README.md   | 1 +
 charts/rstudio-workbench/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md
index 2b5700ea6..819a7d97d 100644
--- a/charts/rstudio-workbench/README.md
+++ b/charts/rstudio-workbench/README.md
@@ -452,6 +452,7 @@ Use of [Sealed secrets](https://github.com/bitnami-labs/sealed-secrets) disables
 | affinity | object | `{}` | A map used verbatim as the pod's "affinity" definition |
 | args | list | `[]` | args is the pod container's run arguments. |
 | command | list | `[]` | command is the pod container's run command. By default, it uses the container's default. However, the chart expects a container using `supervisord` for startup |
+| config.annotations.session | object | `{}` | annotations for ConfigMap created for sessions |
 | config.defaultMode.jobJsonOverrides | int | 0644 | default mode for jobJsonOverrides config |
 | config.defaultMode.pam | int | 0644 | default mode for pam scripts |
 | config.defaultMode.prestart | int | 0755 | default mode for prestart config |
diff --git a/charts/rstudio-workbench/values.yaml b/charts/rstudio-workbench/values.yaml
index 88299bf29..77c8dd4e8 100644
--- a/charts/rstudio-workbench/values.yaml
+++ b/charts/rstudio-workbench/values.yaml
@@ -418,7 +418,7 @@ config:
     pam: 0644
 
   annotations:
-    # annotations for ConfigMap created for sessions
+    # -- annotations for ConfigMap created for sessions
     session: {}
 
   # -- a map of session-scoped config files. Mounted to `/mnt/session-configmap/rstudio/` on both server and session, by default.