From 7d345e3ed28b83f19a644854065bb356a0fff798 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 27 Sep 2024 22:54:30 +0530 Subject: [PATCH 1/2] A few deployments - Set resource requests very generously for everything. https://github.com/2i2c-org/unnamed-thingity-thing/issues/78 - Specify footer correctly - Switch to community provided domain https://github.com/2i2c-org/unnamed-thingity-thing/issues/79 --- helm-charts/app/Chart.yaml | 2 +- helm-charts/app/prod/prod.values.yaml | 79 ++++++++++++++++++++++++- helm-charts/support/support.values.yaml | 8 +++ 3 files changed, 85 insertions(+), 4 deletions(-) diff --git a/helm-charts/app/Chart.yaml b/helm-charts/app/Chart.yaml index e644e5c..ee9e218 100644 --- a/helm-charts/app/Chart.yaml +++ b/helm-charts/app/Chart.yaml @@ -7,7 +7,7 @@ appVersion: "1.0" dependencies: - name: unnamed - version: 0.0.1-0.dev.git.168.h7074c29 + version: 0.0.1-0.dev.git.205.ha41b1b4 repository: https://2i2c.org/unnamed-thingity-thing/ # ingress-nginx for a k8s Ingress resource controller that routes traffic from # a single IP entrypoint to various services exposed via k8s Ingress resources diff --git a/helm-charts/app/prod/prod.values.yaml b/helm-charts/app/prod/prod.values.yaml index 95493d2..54882bf 100644 --- a/helm-charts/app/prod/prod.values.yaml +++ b/helm-charts/app/prod/prod.values.yaml @@ -1,4 +1,20 @@ unnamed: + resources: + # Very generous memory requests and limits + requests: + memory: 2Gi + cpu: 1 + limits: + memory: 8Gi + cpu: 2 + nginx: + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 1Gi + cpu: 2 ingress: enabled: true annotations: @@ -6,10 +22,12 @@ unnamed: cert-manager.io/cluster-issuer: letsencrypt-prod hosts: - cellmapchallenge.2i2c.cloud + - cellmapchallenge.janelia.org tls: - secretName: https-auto-tls hosts: - cellmapchallenge.2i2c.cloud + - cellmapchallenge.janelia.org pvc: storageClassName: premium-rwo @@ -23,15 +41,70 @@ unnamed: overrides: ALLOWED_HOSTS: - cellmapchallenge.2i2c.cloud + - cellmapchallenge.janelia.org CSRF_TRUSTED_ORIGINS: - https://cellmapchallenge.2i2c.cloud + - https://cellmapchallenge.janelia.org DEBUG: True SOCIALACCOUNT_PROVIDERS: github: APP: client_id: Ov23liSODletCDyM8sa8 - redirect_uri: http://cellmapchallenge.2i2c.cloud/accounts/github/login/callback/ + redirect_uri: https://cellmapchallenge.janelia.org/accounts/github/login/callback/ VERIFIED_EMAIL: True CHALLENGE_STATE: "NOT_STARTED" - FOOTER: | - + SITE_NAME: CellMap Challenge + SITE_LOGO_URL: /file/header-logo + SITE_PAGE_HEADER_IMAGE_URL: "/file/home-hero-image" + SITE_FOOTER_HTML: |- + + + diff --git a/helm-charts/support/support.values.yaml b/helm-charts/support/support.values.yaml index 93b6661..ffb5bad 100644 --- a/helm-charts/support/support.values.yaml +++ b/helm-charts/support/support.values.yaml @@ -7,3 +7,11 @@ cert-manager: # This option makes it so that the "helm.sh/resource-policy": keep # annotation is added to the CRD. keep: true + +ingress-nginx: + controller: + resources: + requests: + # Overprovision requests, just in case + cpu: 200m + memory: 512Mi \ No newline at end of file From 75c976d72764fade6c3139ea48f693d069b28eb7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:46:35 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- helm-charts/support/support.values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/support/support.values.yaml b/helm-charts/support/support.values.yaml index ffb5bad..34c8b3f 100644 --- a/helm-charts/support/support.values.yaml +++ b/helm-charts/support/support.values.yaml @@ -14,4 +14,4 @@ ingress-nginx: requests: # Overprovision requests, just in case cpu: 200m - memory: 512Mi \ No newline at end of file + memory: 512Mi