Merge pull request #30 from 2i2c-org/bump-2

A few deployments

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

helm-charts/app/prod/prod.values.yaml

@@ -1,15 +1,33 @@
 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:
       nginx.ingress.kubernetes.io/proxy-body-size: 256m
       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: |
-        <script defer data-domain="cellmapchallenge.2i2c.cloud" src="https://plausible.io/js/script.js"></script>
+      SITE_NAME: CellMap Challenge
+      SITE_LOGO_URL: /file/header-logo
+      SITE_PAGE_HEADER_IMAGE_URL: "/file/home-hero-image"
+      SITE_FOOTER_HTML: |-
+        <style>
+          footer, footer a {
+            color: #838286;
+            text-decoration: none
+          }
+        </style>
+        <footer class="text-center break-bootstrap-container py-4 text-uppercase">
+          <div class="container">
+            <div class="d-flex flex-column gap-3">
+              <div>
+                <a href="https://www.janelia.org/project-team/cellmap">
+                  <img src="/file/footer-logo-cellmap" height="48px" width="auto" />
+                </a>
+                <a href="https://www.janelia.org/">
+                  <img
+                    class="ms-2"
+                    src="/file/footer-logo-hhmi"
+                    height="48px"
+                    width="auto"
+                  />
+                </a>
+                <a href="https://2i2c.org/">
+                  <img
+                    class="ms-2"
+                    src="/file/2i2c-blue-logo"
+                    height="48px"
+                    width="auto"
+                  />
+                </a>
+              </div>
+              <div>
+                <small>
+                  <p>
+                    © 2024 CellMap Segmentation Challenge. <br />
+                    This challenge is brought to you by the CellMap Project Team at
+                    HHMI's Janelia Research Campus
+                  </p>
+                </small>
+              </div>
+              <div>
+                <small>
+                  <p>
+                    <a href="mailto:[email protected]">Contact Us</a> |
+                    <a href="https://openorganelle.janelia.org/">OpenOrganelle</a>
+                  </p>
+                </small>
+              </div>
+            </div>
+          </div>
+        </footer>
+        <script defer data-domain="cellmapchallenge.janelia.org" src="https://plausible.io/js/script.js"></script>

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