libraoffice

terra-app-helm/aou-rstudio-chart/templates/deployment.yaml

@@ -47,10 +47,10 @@ spec:
             {{- end }}
           ports:
             - name: http
-              containerPort: 8787
+              containerPort: 8081
               protocol: TCP
           volumeMounts:
-            - mountPath: "/home/rstudio"
+            - mountPath: "/data"
               name: {{ include "app.fullname" . }}-storage
           livenessProbe:
             httpGet:
@@ -61,14 +61,32 @@ spec:
               path: "{{ .Values.image.baseUrl }}"
               port: http
           resources: {}
+        - name: aou-sas
+          image: "us.gcr.io/terra-vdevel-glaring-bean-1388/sas-viya:latest"
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: RUN_MODE
+              value: "developer"
+            - name: SAS_DEBUG
+              value: "0"
+            - name: SETINIT_TEXT
+              value: "{{ .Values.sasLicense }}"
+          ports:
+            - name: sas-http
+              containerPort: 8081
+              protocol: TCP
+          volumeMounts:
+            - mountPath: "/data"
+              name: {{ include "app.fullname" . }}-storage
+          resources: {}
         - name: welder
           image: "us.gcr.io/broad-dsp-gcr-public/welder-server:6648f5c"
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CLOUD_PROVIDER
               value: "gcp"
             - name: LOCKING_ENABLED
-              value: "true"
+              value: "false"
             - name: SHOULD_BACKGROUND_SYNC
               value: "true"
             - name: STORAGE_CONTAINER_RESOURCE_ID
@@ -77,22 +95,6 @@ spec:
               value: "dummy"
             - name: PORT
               value: "8080"
-#            - name: WSM_URL
-#              value: "leo provided"
-#            - name: WORKSPACE_ID
-#              value: "leo provided"
-#            - name: GOOGLE_PROJECT
-#              value: "leo provided"
-#            - name: STAGING_BUCKET
-#              value: "leo provided"
-#            - name: SHOULD_BACKGROUND_SYNC
-#              value: "leo provided"
-#            - name: CLUSTER_NAME
-#              value:"leo provided"
-#            - name: RUNTIME_NAME
-#              value: "leo provided"
-#            - name: OWNER_EMAIL
-#              value: "leo provided"
             {{- range .Values.welder.extraEnv }}
             - name: {{ .name }}
               value: {{ .value | quote }}

terra-app-helm/aou-rstudio-chart/templates/ingress.yaml

@@ -28,17 +28,17 @@ spec:
       http:
         paths:
           - pathType: ImplementationSpecific
-            path: /rstudio(/|$)(.*)
+            path: /welder(/|$)(.*)
             backend:
               service:
-                name: {{ include "app.fullname" . }}
+                name: {{ include "app.fullname" . }}-welder
                 port:
-                  number: 8787
+                  number: 8080
           - pathType: ImplementationSpecific
-            path: /welder(/|$)(.*)
+            path: /sas(/|$)(.*)
             backend:
               service:
-                name: {{ include "app.fullname" . }}-welder
+                name: {{ include "app.fullname" . }}-sas
                 port:
-                  number: 8080
+                  number: 8001
   {{- end }}

terra-app-helm/aou-rstudio-chart/templates/rstudio-svc.yaml → terra-app-helm/aou-rstudio-chart/templates/sas-svc.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "app.fullname" . }}
+  name: {{ include "app.fullname" . }}-sas
   labels:
     {{- include "app.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
   ports:
-    - port: 8787
-      targetPort: http
+    - port: 8001
+      targetPort: sas-http
       protocol: TCP
-      name: http
+      name: sas-http
   selector:
     {{- include "app.selectorLabels" . | nindent 4 }}

terra-app-helm/aou-rstudio-chart/test_values.yaml

@@ -12,13 +12,12 @@ extraEnv:
 #   value: my-workspace
 
 imagePullSecrets: []
-nameOverride: aou-rstudio
-fullnameOverride: aou-rstudio
 
 # Provided by Leonardo
 serviceAccount:
   name: "test-service-account"
 
+sasLicense: "fill me""
 
 service:
   type: ClusterIP
@@ -51,16 +50,16 @@ persistence:
 welder:
   extraEnv:
   - name: GOOGLE_PROJECT
-    value: "cryptic-skyline-320001"
+    value: "terra-vdevel-glaring-bean-1388"
   - name: STAGING_BUCKET
-    value: "aou-startup-script"
+    value: "testbucket-sas-yonghao"
   - name: CLUSTER_NAME
     value: "all-of-us-123"
   - name: RUNTIME_NAME
     value:  "all-of-us-123"
   - name: OWNER_EMAIL
-    value: "yonghaotest1@gmail.com"
+    value: "yonnghao@verily.com"
   - name: WSM_URL
     value: "dummy"
   - name: WORKSPACE_ID
-    value: "dummy"
+    value: "dummy"

terra-app-helm/aou-rstudio-chart/values.yaml

@@ -18,6 +18,8 @@ fullnameOverride: aou-rstudio
 serviceAccount:
   name: ""
 
+license: ""
+
 # TLS and rewrite rules provided by Leonardo
 ingress:
   enabled: true
@@ -47,7 +49,7 @@ nodeSelector: {}
 # either GCE PD provided by Leonardo; or hostPath provided by terra-docker-local.sh
 persistence:
   size: 100G
-  gcePersistentDisk: "disk--test"
+  gcePersistentDisk: "gke-sas-disk"
 
 welder:
   extraEnv: