fix(rstudio) bug fixes and semver (#5769)

* fix(rstudio) bug fixes and semver

* Apply suggestions from code review

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

charts/incubator/rstudio/Chart.yaml

@@ -1,15 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Productivity
 apiVersion: v2
-appVersion: "latest"
+appVersion: "4.2.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
     version: 11.0.9
 deprecated: false
-description: "***NOTE*** First run is slow."
+description: Integrated development environment for R, a programming language for statistical computing and graphics.
 home: https://truecharts.org/charts/incubator/rstudio
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/rstudio.png
 keywords:
@@ -23,7 +19,12 @@ maintainers:
 name: rstudio
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/rstudio
-  - https://github.com/rocker-org/rocker-versioned
+  - https://github.com/rocker-org/rocker-versioned2
   - https://hub.docker.com/r/rocker/rstudio/
 type: application
-version: 2.0.7
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - Productivity
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U

charts/incubator/rstudio/questions.yaml

@@ -8,6 +8,26 @@ questions:
 # Include{replicas}
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
+  - variable: secretEnv
+    group: "App Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: USER
+          label: User Name
+          description: Optionally set a User Name
+          schema:
+            type: string
+            default: ""
+        - variable: PASSWORD
+          label: User Password
+          description: Optionally set a Password
+          schema:
+            type: string
+            private: true
+            default: ""
   - variable: env
     group: "App Configuration"
     label: "Image Environment"
@@ -15,24 +35,18 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: PASSWORD
+        - variable: DISABLE_AUTH
-          label: "PASSWORD"
+          label: Disable Auth
-          description: "Container Variable PASSWORD"
+          description: Disable authentication for RStudio Server.
           schema:
-            type: string
+            type: boolean
-            default: "yourpasswordhere"
+            default: false
         - variable: ROOT
-          label: "ROOT"
+          label: Root
-          description: "Give the user root permissions"
+          description:  If set to true, the default non-root user will be added to the sudoers group when the server init process.
           schema:
-            type: string
+            type: boolean
-            default: "FALSE"
+            default: false
-        - variable: ADD
-          label: "ADD"
-          description: "Input shiny without quotes to add shiny server"
-          schema:
-            type: string
-            default: "shiny"
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
@@ -57,36 +71,22 @@ questions:
                               type: int
                               default: 8787
                               required: true
-        - variable: hostport2
-          label: 'hostport2 service'
-          description: "Required for shiny server"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelectorLoadBalancer}
-# Include{serviceSelectorExtras}
-                    - variable: hostport2
-                      label: "hostport2 Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 3838
-                              required: true
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: userdatadirectory
+        - variable: config
-          label: "userdatadirectory Storage"
+          label: "App Config Storage"
-          description: "Shared folder for saving your files"
+          description: "Stores the Application Configuration."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{persistenceBasic}
+        - variable: workspace
+          label: "App WorkSpace Storage"
+          description: "Stores the Application WorkSpace."
           schema:
             additional_attrs: true
             type: dict

charts/incubator/rstudio/values.yaml

@@ -1,30 +1,27 @@
-env:
-  ADD: shiny
-  PASSWORD: yourpasswordhere
-  ROOT: "FALSE"
 image:
-  pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/rstudio
-  tag: latest@sha256:66604649adaf7738e901f48f7d9865813d187ee7f8510d7510e4680dbd941318
+  pullPolicy: IfNotPresent
-persistence:
+  tag: v4.2.2@sha256:0902a2549c17caf1a4755f95b804685659b2162b3325d2483ad20cefc20d1db6
-  userdatadirectory:
+
-    enabled: true
-    mountPath: /home/rstudio/Documents
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
 securityContext:
   readOnlyRootFilesystem: false
   runAsNonRoot: false
+
+secretEnv:
+  USER: rstudio
+  PASSWORD: rstudio
+
+env:
+  DISABLE_AUTH: false
+  ROOT: "FALSE"
+  USERID: "{{ .Values.podSecurityContext.runAsUser }}"
+  GROUPID: "{{ .Values.podSecurityContext.fsGroup }}"
+
 service:
-  hostport2:
-    enabled: true
-    ports:
-      hostport2:
-        enabled: true
-        port: 3838
-        protocol: TCP
-        targetPort: 3838
   main:
     ports:
       main:
@@ -32,5 +29,13 @@ service:
         protocol: HTTP
         targetPort: 8787
 
+persistence:
+  config:
+    enabled: true
+    mountPath: /home/rstudio/.config/rstudio
+  workspace:
+    enabled: true
+    mountPath: /home/rstudio/workspace
+
 portal:
   enabled: true