From 57f79bfad4cc80422d09e6bf16b4fede3032be8d Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Thu, 4 May 2023 13:01:40 -0400 Subject: [PATCH 1/3] libra --- .../aou-rstudio-chart/templates/deployment.yaml | 16 ++++++++++++++++ .../aou-rstudio-chart/templates/ingress.yaml | 7 +++++++ .../templates/libraoffice-svc.yaml | 15 +++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml diff --git a/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml b/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml index 2be0dfa..e799049 100644 --- a/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml +++ b/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml @@ -61,6 +61,22 @@ spec: path: "{{ .Values.image.baseUrl }}" port: http resources: {} + - name: aou-libraoffice + image: "lscr.io/linuxserver/libreoffice:7.2.2.2-r2-ls44" + imagePullPolicy: IfNotPresent + env: + - name: TITLE + value: "AoU Testing tool" + - name: START_DOCKER + value: "false" + ports: + - name: libra-http + containerPort: 3000 + 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" diff --git a/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml b/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml index 73c3f99..39387d2 100644 --- a/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml +++ b/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml @@ -41,4 +41,11 @@ spec: name: {{ include "app.fullname" . }}-welder port: number: 8080 + - pathType: ImplementationSpecific + path: /libraoffice(/|$)(.*) + backend: + service: + name: {{ include "app.fullname" . }}-libraoffice + port: + number: 3000 {{- end }} diff --git a/terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml b/terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml new file mode 100644 index 0000000..9f41e22 --- /dev/null +++ b/terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "app.fullname" . }}-libraoffice + labels: + {{- include "app.labels" . | nindent 4 }} +spec: + type: ClusterIP + ports: + - port: 3000 + targetPort: libra-http + protocol: TCP + name: libra-http + selector: + {{- include "app.selectorLabels" . | nindent 4 }} From 1a8ff4d2f7fe6a06d8a41572d4382bd4aecf6461 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 5 May 2023 11:00:14 -0400 Subject: [PATCH 2/3] revert delete operation --- terra-app-helm/aou-rstudio-chart/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml b/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml index e799049..55b59e0 100644 --- a/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml +++ b/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml @@ -84,7 +84,7 @@ spec: - name: CLOUD_PROVIDER value: "gcp" - name: LOCKING_ENABLED - value: "true" + value: "false" - name: SHOULD_BACKGROUND_SYNC value: "true" - name: STORAGE_CONTAINER_RESOURCE_ID From 70af6f7bff123a197ee25cc547d6eb9ff493c735 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Fri, 30 Jun 2023 12:41:56 -0400 Subject: [PATCH 3/3] test --- .../templates/deployment.yaml | 38 ++++++------------- .../aou-rstudio-chart/templates/ingress.yaml | 13 ++----- .../templates/libraoffice-svc.yaml | 15 -------- .../{rstudio-svc.yaml => sas-svc.yaml} | 8 ++-- .../aou-rstudio-chart/test_values.yaml | 11 +++--- terra-app-helm/aou-rstudio-chart/values.yaml | 4 +- 6 files changed, 27 insertions(+), 62 deletions(-) delete mode 100644 terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml rename terra-app-helm/aou-rstudio-chart/templates/{rstudio-svc.yaml => sas-svc.yaml} (66%) diff --git a/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml b/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml index 55b59e0..e00f182 100644 --- a/terra-app-helm/aou-rstudio-chart/templates/deployment.yaml +++ b/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,17 +61,19 @@ spec: path: "{{ .Values.image.baseUrl }}" port: http resources: {} - - name: aou-libraoffice - image: "lscr.io/linuxserver/libreoffice:7.2.2.2-r2-ls44" + - name: aou-sas + image: "us.gcr.io/terra-vdevel-glaring-bean-1388/sas-viya:latest" imagePullPolicy: IfNotPresent env: - - name: TITLE - value: "AoU Testing tool" - - name: START_DOCKER - value: "false" + - name: RUN_MODE + value: "developer" + - name: SAS_DEBUG + value: "0" + - name: SETINIT_TEXT + value: "{{ .Values.sasLicense }}" ports: - - name: libra-http - containerPort: 3000 + - name: sas-http + containerPort: 8081 protocol: TCP volumeMounts: - mountPath: "/data" @@ -93,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 }} diff --git a/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml b/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml index 39387d2..cfcbcb4 100644 --- a/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml +++ b/terra-app-helm/aou-rstudio-chart/templates/ingress.yaml @@ -27,13 +27,6 @@ spec: - host: {{ .host | quote }} http: paths: - - pathType: ImplementationSpecific - path: /rstudio(/|$)(.*) - backend: - service: - name: {{ include "app.fullname" . }} - port: - number: 8787 - pathType: ImplementationSpecific path: /welder(/|$)(.*) backend: @@ -42,10 +35,10 @@ spec: port: number: 8080 - pathType: ImplementationSpecific - path: /libraoffice(/|$)(.*) + path: /sas(/|$)(.*) backend: service: - name: {{ include "app.fullname" . }}-libraoffice + name: {{ include "app.fullname" . }}-sas port: - number: 3000 + number: 8001 {{- end }} diff --git a/terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml b/terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml deleted file mode 100644 index 9f41e22..0000000 --- a/terra-app-helm/aou-rstudio-chart/templates/libraoffice-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "app.fullname" . }}-libraoffice - labels: - {{- include "app.labels" . | nindent 4 }} -spec: - type: ClusterIP - ports: - - port: 3000 - targetPort: libra-http - protocol: TCP - name: libra-http - selector: - {{- include "app.selectorLabels" . | nindent 4 }} diff --git a/terra-app-helm/aou-rstudio-chart/templates/rstudio-svc.yaml b/terra-app-helm/aou-rstudio-chart/templates/sas-svc.yaml similarity index 66% rename from terra-app-helm/aou-rstudio-chart/templates/rstudio-svc.yaml rename to terra-app-helm/aou-rstudio-chart/templates/sas-svc.yaml index a3c9edd..b96538e 100644 --- a/terra-app-helm/aou-rstudio-chart/templates/rstudio-svc.yaml +++ b/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 }} diff --git a/terra-app-helm/aou-rstudio-chart/test_values.yaml b/terra-app-helm/aou-rstudio-chart/test_values.yaml index 9aefc5a..f4c86d4 100644 --- a/terra-app-helm/aou-rstudio-chart/test_values.yaml +++ b/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" \ No newline at end of file + value: "dummy" diff --git a/terra-app-helm/aou-rstudio-chart/values.yaml b/terra-app-helm/aou-rstudio-chart/values.yaml index 89abde6..e0bf297 100644 --- a/terra-app-helm/aou-rstudio-chart/values.yaml +++ b/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: