Hotfix/shiny proxy internet egress (#119)

ScilifelabDataCentre · Dec 8, 2023 · 3425516 · 3425516
1 parent 0d27749
commit 3425516
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/charts/apps/shinyproxy/chart/templates/configmap.yaml b/charts/apps/shinyproxy/chart/templates/configmap.yaml
@@ -35,7 +35,7 @@ data:
         id:  {{ .Release.Name }}
         labels:
           sp.instance: {{ .Release.Name }}
-          alow-api-access: "true"
+          allow-internet-egress: "true"
           shinyproxy-app: {{ .Release.Name }}
         kubernetes-pod-patches: |
           - op: add

diff --git a/charts/apps/shinyproxy/chart/templates/deployment.yaml b/charts/apps/shinyproxy/chart/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
       affinity:
         {{ .Values.affinity | toYaml | nindent 8 | trim }}
     {{ end }}
-      automountServiceAccountToken: true
+      serviceAccountName: {{ .Values.namespace }}-shinyproxy
       containers:
       - name: serve
         image: {{ .Values.appconfig.proxyimage }}

diff --git a/charts/apps/shinyproxy/chart/templates/hooks.yaml b/charts/apps/shinyproxy/chart/templates/hooks.yaml
@@ -17,7 +17,7 @@ spec:
         allow-api-access: "true"
     spec:
       restartPolicy: Never
-      serviceAccountName: default
+      serviceAccountName: {{ .Values.namespace }}-shinyproxy
       containers:
       - name: delete-user-pods
         image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}

diff --git a/charts/apps/shinyproxy/chart/templates/ingress.yaml b/charts/apps/shinyproxy/chart/templates/ingress.yaml
@@ -10,6 +10,7 @@ metadata:
     nginx.ingress.kubernetes.io/auth-url: "{{ .Values.global.protocol }}://{{ .Values.global.auth_domain }}:8080/auth/?release={{ .Values.release }}"
     nginx.ingress.kubernetes.io/auth-signin: "https://{{ .Values.global.domain }}/accounts/login/?next=$scheme%3A%2F%2F$host"
     {{- end }}
+    nginx.ingress.kubernetes.io/proxy-body-size: 2000m
     #nginx.ingress.kubernetes.io/auth-response-headers: X-Forwarded-Host
 spec:
   rules:

diff --git a/fixtures/objecttype_fixtures.json b/fixtures/objecttype_fixtures.json
@@ -37,7 +37,7 @@
   },
   {
     "fields": {
-      "app_slug": "fastapi-serve",
+      "app_slug": "python-serve",
       "name": "Python Model Deployment",
       "slug": "python"
     },

diff --git a/fixtures/projects_templates.json b/fixtures/projects_templates.json
@@ -31,7 +31,7 @@
             "image": "serve-mlflow:231030-1149",
             "repository": "ghcr.io/scilifelabdatacentre"
           },
-          "Default Serving": {
+          "Python Serving": {
             "app": "python-serve",
             "image": "serve-python:latest",
             "repository": "ghcr.io/scilifelabdatacentre"
@@ -103,7 +103,7 @@
             "image": "serve-mlflow:231030-1149",
             "repository": "ghcr.io/scilifelabdatacentre"
           },
-          "Default Serving": {
+          "Python Serving": {
             "app": "python-serve",
             "image": "serve-python:latest",
             "repository": "ghcr.io/scilifelabdatacentre"