From 772d7430e2a740a9ec12a5fd42678b27f95cfba0 Mon Sep 17 00:00:00 2001
From: Siri Kallhovd <47630846+sirikal@users.noreply.github.com>
Date: Mon, 9 Sep 2024 09:53:41 +0200
Subject: [PATCH] updating to r version 4.4.1, and avoid removing shiny
 application folder

---
 repos/stable/rstudio/Chart.yaml               |  6 +-
 repos/stable/rstudio/README.md                |  2 +-
 repos/stable/rstudio/schema.yaml              |  4 +-
 .../stable/rstudio/templates/deployment.yaml  | 59 +------------------
 repos/stable/rstudio/values.yaml              |  6 +-
 5 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/repos/stable/rstudio/Chart.yaml b/repos/stable/rstudio/Chart.yaml
index 10a269ff..340b3133 100755
--- a/repos/stable/rstudio/Chart.yaml
+++ b/repos/stable/rstudio/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 description: RStudio is an integrated development environment (IDE) for R
 name: rstudio
 maintainers:
-- name: Uninett AS
-  email: system@uninett.no
+- name: Sigma2 AS
+  email: contact@sigma2.no
 home: https://www.rstudio.com/products/RStudio/
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-flat.svg
-version: 1.3.0
+version: 1.3.1
 keywords:
   - R web IDE
diff --git a/repos/stable/rstudio/README.md b/repos/stable/rstudio/README.md
index 2392a612..75f5e934 100644
--- a/repos/stable/rstudio/README.md
+++ b/repos/stable/rstudio/README.md
@@ -15,4 +15,4 @@ browser.
 ### Advanced
 This application uses the following Dockerfile:
 
-- [RStudio](https://github.com/UNINETTSigma2/helm-charts-dockerfiles/blob/ecce41f70eaa010ed80a304c48188bb22c1950a0/rstudio/server/Dockerfile)
+- [RStudio](https://github.com/UNINETTSigma2/helm-charts-dockerfiles/tree/c3436d5/rstudio/server/Dockerfile)
diff --git a/repos/stable/rstudio/schema.yaml b/repos/stable/rstudio/schema.yaml
index 108eb9de..e04485c2 100644
--- a/repos/stable/rstudio/schema.yaml
+++ b/repos/stable/rstudio/schema.yaml
@@ -11,7 +11,7 @@ properties:
       dockerImage:
         type: string
         examples:
-        - sigma2as/rstudio-server:20240312-ecce41f
+        - sigma2as/rstudio-server:20240830-c3436d5
   appstore_generated_data:
     type: object
     properties:
@@ -21,7 +21,7 @@ properties:
           contact_email:
             type: string
             examples:
-            - example@uninett.no
+            - example@sigma2.no
       dataporten:
         type: object
         properties:
diff --git a/repos/stable/rstudio/templates/deployment.yaml b/repos/stable/rstudio/templates/deployment.yaml
index 82f07999..81e3d91f 100644
--- a/repos/stable/rstudio/templates/deployment.yaml
+++ b/repos/stable/rstudio/templates/deployment.yaml
@@ -211,61 +211,4 @@ spec:
           mountPropagation: HostToContainer
           readOnly: {{ .Values.persistentStorage.readOnly }}
           subPath: home/{{ .Values.username }}
-        {{- end -}}
-
-
-{{ if ne .Values.persistentStorage.existingClaim "" }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "{{.Release.Name}}-cleaner"
-  labels:
-    heritage: {{.Release.Service | quote }}
-    release: {{.Release.Name | quote }}
-    chart: "{{.Chart.Name}}-{{.Chart.Version}}"
-  annotations:
-    appstore.uninett.no/contact_email: {{ .Values.appstore_generated_data.appstore_meta_data.contact_email }}
-    "helm.sh/hook": post-delete
-    "helm.sh/hook-weight": "2"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  template:
-    metadata:
-      name: "{{.Release.Name}}-cleaner"
-      labels:
-        heritage: {{.Release.Service | quote }}
-        release: {{.Release.Name | quote }}
-        chart: "{{.Chart.Name}}-{{.Chart.Version}}"
-    spec:
-      volumes:
-      - name: {{ .Values.persistentStorage.existingClaimName }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistentStorage.existingClaim }}
-      restartPolicy: Never
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: {{ .Values.uid }}
-        runAsGroup: {{ .Values.gid }}
-        fsGroup: {{ .Values.gid }}
-        {{ $firstGroup := .Values.supplementalGroups | first }}
-        {{- if $firstGroup.gid }}
-        supplementalGroups:
-          {{- range .Values.supplementalGroups }}
-          - {{ .gid }}
-          {{- end }}
-        {{- end }}
-      containers:
-      - name: cleaner-job
-        image: "alpine:3.13.5"
-        imagePullPolicy: IfNotPresent
-        command:
-          - /bin/sh
-        args:
-          - -c
-          - -x
-          - "rm -rf /mnt/{{ .Values.persistentStorage.existingClaimName }}/.tools/{{ template "fullname" . }}"
-        volumeMounts:
-        - name: {{ .Values.persistentStorage.existingClaimName }}
-          mountPath: /mnt/{{ .Values.persistentStorage.existingClaimName }}
-{{ end }}
+        {{- end -}}
\ No newline at end of file
diff --git a/repos/stable/rstudio/values.yaml b/repos/stable/rstudio/values.yaml
index fb4c22eb..8ec920ba 100755
--- a/repos/stable/rstudio/values.yaml
+++ b/repos/stable/rstudio/values.yaml
@@ -20,7 +20,7 @@ persistentStorage:
   readOnly: false
 appstore_generated_data:
   appstore_meta_data:
-    contact_email: "example@uninett.no"
+    contact_email: "example@sigma2.no"
   dataporten:
     scopes:
       - ""
@@ -40,8 +40,8 @@ appstore_generated_data:
     authorized_principals: []
 advanced:
   debug: false
-  dockerImage: sigma2as/rstudio-server:20240312-ecce41f
-  proxyImage: sigma2as/rstudio-proxy:20231117-eca0b21
+  dockerImage: sigma2as/rstudio-server:20240830-c3436d5
+  proxyImage: sigma2as/rstudio-proxy:20240903-f399a71
 authGroupProviders:
   - url: "https://groups-api.dataporten.no/groups/me/groups"
     scope: groups