From 2459e03185de0a57c3c301e0113c7eef400b99dc Mon Sep 17 00:00:00 2001 From: Nikita Churikov Date: Wed, 11 Dec 2024 11:41:46 +0100 Subject: [PATCH 1/3] Download error pages form the github in the init container --- .../error-page-404.html | 226 +- k8s-error-pages/error-page-500.html | 2907 +++++++++++++++++ k8s-error-pages/error-page-502.html | 2907 +++++++++++++++++ .../error-page-503.html | 228 +- serve/templates/custom-default-backend.yaml | 49 +- serve/templates/ingress-platform.yaml | 2 +- 6 files changed, 6017 insertions(+), 302 deletions(-) rename error-page-404.html => k8s-error-pages/error-page-404.html (81%) create mode 100644 k8s-error-pages/error-page-500.html create mode 100644 k8s-error-pages/error-page-502.html rename error-page-503.html => k8s-error-pages/error-page-503.html (81%) diff --git a/error-page-404.html b/k8s-error-pages/error-page-404.html similarity index 81% rename from error-page-404.html rename to k8s-error-pages/error-page-404.html index 3feb67b..5f6797e 100644 --- a/error-page-404.html +++ b/k8s-error-pages/error-page-404.html @@ -1,22 +1,17 @@ - - - Not found | SciLifeLab Serve (beta) - - - - - - - - - - - - - - + + +Not found | SciLifeLab Serve (beta) + + + + + + + - - ")}}function zn(){const e=ne().querySelector('meta[name="htmx-config"]');if(e){return S(e.content)}else{return null}}function Jn(){const e=zn();if(e){Q.config=ue(Q.config,e)}}_n(function(){Jn();$n();let e=ne().body;kt(e);const t=ne().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.target;const n=ie(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){Yt();se(t,function(e){he(e,"htmx:restored",{document:ne(),triggerEvent:he})})}else{if(n){n(e)}}};E().setTimeout(function(){he(e,"htmx:load",{});e=null},0)});return Q}(); - - - - - - + - - - - -
- -

Page cannot be served 🥁 (404 error)

-

It's okay, don't worry. Just go to the home page +

+

Page cannot be served 🥁 (404 error)

+

It's okay, don't worry. Just go to the home page and try what you wanted to do again.

- -
- - - - - - - - - - +
+
- -
- - - - -
-
-
    -
- -
-
-

SciLifeLab Serve (beta) is developed and operated by the SciLifeLab Data Centre. - SciLifeLab Serve is free to use for all life science researchers -affiliated with a Swedish research institution and their collaborators. -The service is hosted on a Kubernetes cluster. The code behind +

+
+
+
    +
+
+
+

SciLifeLab Serve (beta) is developed and operated by the SciLifeLab Data Centre. + SciLifeLab Serve is free to use for all life science researchers +affiliated with a Swedish research institution and their collaborators. +The service is hosted on a Kubernetes cluster. The code behind SciLifeLab Serve is available on Github.

-

Please email serve@scilifelab.se with any questions.

-
-
-
-
-

Supported by:

-
-
-
-
SciLifeLab
-
Swedish Foundation for Strategic Research
-
Knut and Alice Wallenberg Foundation
-
-
-
-
+

Please email serve@scilifelab.se with any questions.

- - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/k8s-error-pages/error-page-500.html b/k8s-error-pages/error-page-500.html new file mode 100644 index 0000000..c774f11 --- /dev/null +++ b/k8s-error-pages/error-page-500.html @@ -0,0 +1,2907 @@ + + + + +Temporary not available | SciLifeLab Serve (beta) + + + + + + + + + + + + + + + + + + + + + + + + +
+

Service encountered an internal problem (500 error)

+

Sorry for the inconvenience. Just try to go to the home page + or attempt what you wanted to do again a bit later.

+

If the problem persists please contact us via serve@scilifelab.se and describe the issue. +

+
+ +
+
+
+
+
    +
+
+
+

SciLifeLab Serve (beta) is developed and operated by the SciLifeLab Data Centre. + SciLifeLab Serve is free to use for all life science researchers +affiliated with a Swedish research institution and their collaborators. +The service is hosted on a Kubernetes cluster. The code behind +SciLifeLab Serve is available on Github.

+

Please email serve@scilifelab.se with any questions.

+
+
+
+
+

Supported by:

+
+
+
+
SciLifeLab
+
Swedish Foundation for Strategic Research
+
Knut and Alice Wallenberg Foundation
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/k8s-error-pages/error-page-502.html b/k8s-error-pages/error-page-502.html new file mode 100644 index 0000000..bde939f --- /dev/null +++ b/k8s-error-pages/error-page-502.html @@ -0,0 +1,2907 @@ + + + + +Temporary not available | SciLifeLab Serve (beta) + + + + + + + + + + + + + + + + + + + + + + + + +
+

Service is temporary unavailable (502 error)

+

Sorry for the inconvenience. Just try to go to the home page + or attempt what you wanted to do again a bit later.

+

If the problem persists please contact us via serve@scilifelab.se and describe the issue. +

+
+ +
+
+
+
+
    +
+
+
+

SciLifeLab Serve (beta) is developed and operated by the SciLifeLab Data Centre. + SciLifeLab Serve is free to use for all life science researchers +affiliated with a Swedish research institution and their collaborators. +The service is hosted on a Kubernetes cluster. The code behind +SciLifeLab Serve is available on Github.

+

Please email serve@scilifelab.se with any questions.

+
+
+
+
+

Supported by:

+
+
+
+
SciLifeLab
+
Swedish Foundation for Strategic Research
+
Knut and Alice Wallenberg Foundation
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/error-page-503.html b/k8s-error-pages/error-page-503.html similarity index 81% rename from error-page-503.html rename to k8s-error-pages/error-page-503.html index 8c46285..4491037 100644 --- a/error-page-503.html +++ b/k8s-error-pages/error-page-503.html @@ -1,20 +1,17 @@ - - - Temporary not available | SciLifeLab Serve (beta) - - - - - - - - - - - - + + +Temporary not available | SciLifeLab Serve (beta) + + + + + + + - - ")}}function zn(){const e=ne().querySelector('meta[name="htmx-config"]');if(e){return S(e.content)}else{return null}}function Jn(){const e=zn();if(e){Q.config=ue(Q.config,e)}}_n(function(){Jn();$n();let e=ne().body;kt(e);const t=ne().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.target;const n=ie(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){Yt();se(t,function(e){he(e,"htmx:restored",{document:ne(),triggerEvent:he})})}else{if(n){n(e)}}};E().setTimeout(function(){he(e,"htmx:load",{});e=null},0)});return Q}(); - - - - - - + - - - - -
- -

Service is temporary unavailable (503 error)

-

The application is being created, please wait ☕️.

-

Try to refresh page a few times or if it takes too long return to the previous page.

-

If the problem persists please contact us via serve@scilifelab.se and describe the issue. +

+

Service is temporary unavailable (503 error)

+

The application is being created, please wait ☕️.

+

Try to refresh page a few times or if it takes too long return to the previous page.

+

If the problem persists please contact us via serve@scilifelab.se and describe the issue.

- -
- - - - - - - - - - +
+
- -
- - - - -
-
-
    -
- -
-
-

SciLifeLab Serve (beta) is developed and operated by the SciLifeLab Data Centre. - SciLifeLab Serve is free to use for all life science researchers -affiliated with a Swedish research institution and their collaborators. -The service is hosted on a Kubernetes cluster. The code behind +

+
+
+
    +
+
+
+

SciLifeLab Serve (beta) is developed and operated by the SciLifeLab Data Centre. + SciLifeLab Serve is free to use for all life science researchers +affiliated with a Swedish research institution and their collaborators. +The service is hosted on a Kubernetes cluster. The code behind SciLifeLab Serve is available on Github.

-

Please email serve@scilifelab.se with any questions.

-
-
-
-
-

Supported by:

-
-
-
-
SciLifeLab
-
Swedish Foundation for Strategic Research
-
Knut and Alice Wallenberg Foundation
-
-
-
-
+

Please email serve@scilifelab.se with any questions.

- - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/serve/templates/custom-default-backend.yaml b/serve/templates/custom-default-backend.yaml index bec79bc..b7fd668 100644 --- a/serve/templates/custom-default-backend.yaml +++ b/serve/templates/custom-default-backend.yaml @@ -35,44 +35,43 @@ spec: app.kubernetes.io/name: nginx-errors app.kubernetes.io/part-of: ingress-nginx spec: + initContainers: + - name: fetch-error-pages + image: curlimages/curl:latest + command: + - /bin/sh + - -c + - | + mkdir -p /www + curl -o /www/404.html https://raw.githubusercontent.com/ScilifelabDataCentre/serve-charts/refs/heads/develop/k8s-error-pages/error-page-404.html + curl -o /www/503.html https://raw.githubusercontent.com/ScilifelabDataCentre/serve-charts/refs/heads/develop/k8s-error-pages/error-page-503.html + curl -o /www/502.html https://raw.githubusercontent.com/ScilifelabDataCentre/serve-charts/refs/heads/develop/k8s-error-pages/error-page-502.html + curl -o /www/500.html https://raw.githubusercontent.com/ScilifelabDataCentre/serve-charts/refs/heads/develop/k8s-error-pages/error-page-500.html + + volumeMounts: + - name: error-pages + mountPath: /www containers: - name: nginx-error-server image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.0.2@sha256:b2259cf6bfda813548a64bded551b1854cb600c4f095738b49b4c5cdf8ab9d21 ports: - containerPort: 8080 - # Mounting custom error page from ConfigMap 1 volumeMounts: - - name: custom-error-pages-404 - mountPath: /www/404.html - subPath: 404.html - # Mounting custom error page from ConfigMap 2 - - name: custom-error-pages-503 - mountPath: /www/503.html - subPath: 503.html + - name: error-pages + mountPath: /www - # Mounting volumes from two ConfigMaps volumes: - - name: custom-error-pages-404 - configMap: - name: custom-error-pages-404 - items: - - key: "404" - path: "404.html" - - name: custom-error-pages-503 - configMap: - name: custom-error-pages-503 - items: - - key: "503" - path: "503.html" + - name: error-pages + emptyDir: {} --- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: - nginx.ingress.kubernetes.io/custom-http-errors: 503,404 + nginx.ingress.kubernetes.io/custom-http-errors: 503,502,500,404 nginx.ingress.kubernetes.io/default-backend: nginx-errors - name: wildcard-test-srv-dev - namespace: serve-dev + name: wildcard-serve-errors-ingress + namespace: {{ .Values.namespace }} spec: defaultBackend: service: @@ -92,6 +91,6 @@ spec: pathType: ImplementationSpecific tls: - hosts: - - '*.serve-dev.scilifelab.se' + - '*.{{ .Values.domain }}' secretName: prod-ingress diff --git a/serve/templates/ingress-platform.yaml b/serve/templates/ingress-platform.yaml index 13d8007..63e2f9e 100644 --- a/serve/templates/ingress-platform.yaml +++ b/serve/templates/ingress-platform.yaml @@ -7,7 +7,7 @@ metadata: {{- with .Values.ingress.annotations }} {{- toYaml . | nindent 4 }} {{- end }} - nginx.ingress.kubernetes.io/custom-http-errors: "503" + nginx.ingress.kubernetes.io/custom-http-errors: "503,502" nginx.ingress.kubernetes.io/default-backend: nginx-errors labels: io.kompose.service: {{ .Release.Name }}-ingress From 31c42031beef89ecf4249a0274e96d25408de24d Mon Sep 17 00:00:00 2001 From: Nikita Churikov Date: Wed, 11 Dec 2024 13:55:58 +0100 Subject: [PATCH 2/3] Add egress for the default backend --- serve/templates/custom-default-backend.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/serve/templates/custom-default-backend.yaml b/serve/templates/custom-default-backend.yaml index b7fd668..ae22172 100644 --- a/serve/templates/custom-default-backend.yaml +++ b/serve/templates/custom-default-backend.yaml @@ -1,4 +1,22 @@ # Configuration for the default backend: service and handling of a 404 error on a subdomain level (wild card domain). +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: allow-ingress-from-default-backend + namespace: {{ .Values.namespace | default "default" }} +spec: + podSelector: + matchLabels: + app.kubernetes.io/name: nginx-errors + policyTypes: + - Ingress + ingress: + - from: + - podSelector: + matchLabels: + app.kubernetes.io/name: nginx-errors + --- apiVersion: v1 kind: Service From 8ed4cd884f8d5fb8232230da070c51b18fee3fcb Mon Sep 17 00:00:00 2001 From: Nikita Churikov Date: Wed, 11 Dec 2024 14:29:42 +0100 Subject: [PATCH 3/3] Add egress for the default backend --- serve/templates/custom-default-backend.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/serve/templates/custom-default-backend.yaml b/serve/templates/custom-default-backend.yaml index ae22172..3f7ed68 100644 --- a/serve/templates/custom-default-backend.yaml +++ b/serve/templates/custom-default-backend.yaml @@ -10,13 +10,14 @@ spec: matchLabels: app.kubernetes.io/name: nginx-errors policyTypes: - - Ingress - ingress: - - from: - - podSelector: - matchLabels: - app.kubernetes.io/name: nginx-errors - + - Egress + egress: + - to: + - ipBlock: + cidr: 0.0.0.0/0 + ports: + - protocol: TCP + port: 443 --- apiVersion: v1 kind: Service