Merge branch 'rspprod' into main

lsst-uk · Dec 3, 2024 · 2a56874 · 2a56874
2 parents 5c20706 + 1a3ed1f
commit 2a56874
Show file tree

Hide file tree

Showing 23 changed files with 411 additions and 10 deletions.
diff --git a/applications/argocd/values-rsptest.yaml b/applications/argocd/values-rsptest.yaml
@@ -0,0 +1,23 @@
+argo-cd:
+  configs:
+    cm:
+      url: "https://rsp-test.lsst.ac.uk/argo-cd"
+    secret:
+      createSecret: true
+
+  server:
+    ingress:
+      hostname: "rsp-test.lsst.ac.uk"
+    tls: false
+# argo-cd:
+#   server:
+#     ingress:
+#       hosts:
+#         - "rsp-test.lsst.ac.uk"
+
+#     config:
+#       url: "https://rsp-test.lsst.ac.uk/argo-cd"
+
+#   configs:
+#     secret:
+#       createSecret: true
diff --git a/applications/cert-manager/values-rsptest.yaml b/applications/cert-manager/values-rsptest.yaml
@@ -0,0 +1,7 @@
+config:
+  createIssuer: false
+# config:
+#   email: "[email protected]"
+#   route53:
+#     awsAccessKeyId: "AKIAQSJOS2SFL5I4TYND"
+#     hostedZone: "Z0567328105IEHEMIXLCO"
diff --git a/applications/exposurelog/values-rsptest.yaml b/applications/exposurelog/values-rsptest.yaml
@@ -0,0 +1,8 @@
+config:
+  # WARNING: this is a "playground" deployment
+  # using exposurelog's built-in test butler registries.
+  site_id: test
+  # Use the test butler registries.
+  # Note: exposurelog's Dockerfile copies the test repos to the top of the container
+  butler_uri_1: LSSTCam
+  butler_uri_2: LATISS
diff --git a/applications/gafaelfawr/values-roe.yaml b/applications/gafaelfawr/values-roe.yaml
@@ -4,11 +4,16 @@ redis:
 
 config:
   internalDatabase: true
+  updateSchema: true
 
   github:
     clientId: "10172b4db1b67ee31620"
 
-  # Allow access by GitHub team.
+
+# Support generating user metadata for CADC authentication code.
+  cadcBaseUuid: "4cb5f948-aad9-466c-837b-5eae565b0a77"
+
+# Allow access by GitHub team.
   groupMapping:
     "exec:admin":
       - github:
@@ -36,4 +41,6 @@ config:
           team: "dev"
 
   initialAdmins:
-    - "stvoutsin"
+    - "gpfrancis"
+    - "aibsen"
+    - "davedavemckay"
diff --git a/applications/gafaelfawr/values-rsptest.yaml b/applications/gafaelfawr/values-rsptest.yaml
@@ -0,0 +1,58 @@
+redis:
+  persistence:
+    enabled: false
+
+config:
+  updateSchema: false
+  internalDatabase: true
+  #databaseUrl: "postgresql://[email protected]/gafaelfawr"
+
+  github:
+    clientId: "c4a5727c5788cc2d346e"
+
+  # Allow access by GitHub team.
+  groupMapping:
+    "exec:admin":
+      - github:
+          organization: "lsp-uk"
+          team: "dev"
+    "exec:notebook":
+      - github:
+          organization: "lsp-uk"
+          team: "dev"
+    "exec:internal-tools":
+      - github:
+          organization: "lsp-uk"
+          team: "dev"
+    "exec:portal":
+      - github:
+          organization: "lsp-uk"
+          team: "dev"
+    # "exec:user":
+    #   - github:
+    #       organization: "lsp-uk"
+    #       team: "dev"
+    # "read:workspace":
+    #   - github:
+    #       organization: "lsp-uk"
+    #       team: "dev"
+    # "read:workspace/user":
+    #   - github:
+    #       organization: "lsp-uk"
+    #       team: "dev"
+    # "write:workspace/user":
+    #   - github:
+    #       organization: "lsp-uk"
+    #       team: "dev"
+    "read:image":
+      - github:
+          organization: "lsp-uk"
+          team: "dev"
+    "read:tap":
+      - github:
+          organization: "lsp-uk"
+          team: "dev"
+
+  initialAdmins:
+    - "gpfrancis"
+    - "aibsen"
diff --git a/applications/ingress-nginx/values-roe.yaml b/applications/ingress-nginx/values-roe.yaml
@@ -7,7 +7,7 @@ ingress-nginx:
       use-proxy-protocol: "false"
       enable-health-monitor: "false"
     service:
-      loadBalancerIP: "192.41.122.16"
+      loadBalancerIP: "192.41.122.216"
       annotations:
         kubernetes.io/ingress.class: "openstack"
         loadbalancer.openstack.org/enable-health-monitor: "false"

diff --git a/applications/ingress-nginx/values-rsptest.yaml b/applications/ingress-nginx/values-rsptest.yaml
@@ -0,0 +1,17 @@
+ingress-nginx:
+  controller:
+    kind: DaemonSet
+    config:
+      large-client-header-buffers: "4 64k"
+      proxy-buffer-size: "64k"
+      use-proxy-protocol: "false"
+      enable-health-monitor: "false"
+    service:
+      loadBalancerIP: "192.41.122.55"
+      annotations:
+        kubernetes.io/ingress.class: "openstack"
+        loadbalancer.openstack.org/enable-health-monitor: "false"
+    extraArgs:
+      default-ssl-certificate: ingress-nginx/ingress-certificate
+vaultCertificate:
+  enabled: true
diff --git a/applications/mobu/values-rsptest.yaml b/applications/mobu/values-rsptest.yaml
@@ -0,0 +1,48 @@
+# config:
+#   autostart:
+#     - name: "firefighter"
+#       count: 1
+#       users:
+#         - username: "bot-mobu-recommended"
+#           uidnumber: 74768
+#           gidnumber: 74768
+#       scopes: ["exec:notebook", "exec:portal", "read:image", "read:tap"]
+#       business:
+#         type: "NotebookRunner"
+#         options:
+#           repo_url: "https://github.com/lsst-sqre/system-test.git"
+#           repo_branch: "prod"
+#           max_executions: 1
+#         restart: true
+#     - name: "weekly"
+#       count: 1
+#       users:
+#         - username: "bot-mobu-weekly"
+#           uidnumber: 74769
+#           gidnumber: 74769
+#       scopes: ["exec:notebook", "exec:portal", "read:image", "read:tap"]
+#       business:
+#         type: "NotebookRunner"
+#         options:
+#           image:
+#             image_class: "latest-weekly"
+#           repo_url: "https://github.com/lsst-sqre/system-test.git"
+#           repo_branch: "prod"
+#         restart: true
+config:
+  autostart:
+    - name: "tap"
+      count: 1
+      users:
+        - username: "bot-mobu-tap"
+          uidnumber: 74768
+          gidnumber: 74768
+      scopes: ["read:tap"]
+      business:
+        type: "TAPQueryRunner"
+        options:
+          queries:
+            - "SELECT TOP 10 * FROM  video.hsc_g_f"
+            - "SELECT TOP 10 * FROM  TAP_SCHEMA.tables"
+            - "SELECT TOP 10 * FROM  viking.hsc_g_f"
+        restart: true
diff --git a/applications/nublado/values-rsptest.yaml b/applications/nublado/values-rsptest.yaml
@@ -0,0 +1,61 @@
+controller:
+  config:
+    images:
+      source:
+        type: "docker"
+        registry: "registry.hub.docker.com"
+        repository: "lsstsqre/sciplat-lab"
+    lab:
+      env:
+        AUTO_REPO_URLS: "https://github.com/lsst-uk/rsp-uk-notebooks"
+        AUTO_REPO_BRANCH: "main"
+        AUTO_REPO_SPECS: "https://github.com/lsst-uk/rsp-uk-notebooks@main"
+      initContainers:
+        - name: "inithome"
+          image:
+            repository: "ghcr.io/lsst-sqre/nublado-inithome"
+            tag: "4.0.2"
+          privileged: true
+          volumeMounts:
+            - containerPath: "/home"
+              volumeName: "home"
+      pullSecret: "pull-secret"
+      volumes:
+        - name: "data"
+          source:
+            serverPath: "/data"
+            server: "192.41.122.94"
+            type: "nfs"
+        - name: "home"
+          source:
+            serverPath: "/jhome"
+            server: "192.41.122.94"
+            type: "nfs"
+        - name: "datasets"
+          source:
+            serverPath: "/datasets"
+            server: "192.41.122.94"
+            type: "nfs"
+      volumeMounts:
+        - containerPath: "/data"
+          volumeName: "data"
+        - containerPath: "/home"
+          volumeName: "home"
+        - containerPath: "/datasets"
+          volumeName: "datasets"
+
+proxy:
+  ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-connect-timeout: "50s"
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "50s"
+      nginx.ingress.kubernetes.io/client-max-body-size: "50m"
+
+jupyterhub:
+  hub:
+    db:
+      upgrade: true
+  cull:
+    timeout: 432000
+    every: 300
+    maxAge: 2160000
diff --git a/applications/portal/values-roe.yaml b/applications/portal/values-roe.yaml
@@ -6,3 +6,4 @@ resources:
 
 config:
   hipsUrl: "http://alasky.cds.unistra.fr/DSS/DSSColor"
+  ssotap: "ssotap"
diff --git a/applications/portal/values-rsptest.yaml b/applications/portal/values-rsptest.yaml
@@ -0,0 +1,8 @@
+replicaCount: 2
+
+resources:
+  limits:
+    memory: "8Gi"
+
+config:
+  hipsUrl: "http://thisdoesntexist.org"
diff --git a/applications/postgres/values-roe.yaml b/applications/postgres/values-roe.yaml
@@ -7,4 +7,4 @@ nublado3_db:
 gafaelfawr_db:
   user: "gafaelfawr"
   db: "gafaelfawr"
-postgresStorageClass: "standard"
+postgresStorageClass: "ceph-hdd"
diff --git a/applications/postgres/values-rsptest.yaml b/applications/postgres/values-rsptest.yaml
@@ -0,0 +1,10 @@
+jupyterhub_db:
+  user: "jovyan"
+  db: "jupyterhub"
+nublado3_db:
+  user: 'nublado3'
+  db: 'nublado3'
+gafaelfawr_db:
+  user: "gafaelfawr"
+  db: "gafaelfawr"
+postgresStorageClass: "standard"
diff --git a/applications/semaphore/values-rsptest.yaml b/applications/semaphore/values-rsptest.yaml
@@ -0,0 +1,11 @@
+image:
+  pullPolicy: Always
+config:
+  github_app_id: "1452049"
+  enable_github_app: "True"
+  phalanx_env: "rsptest"
+  log_level: "DEBUG"
+
+pull-secret:
+  enabled: true
+  path: secret/k8s_operator/rsptest/pull-secret
diff --git a/applications/squareone/values-roe.yaml b/applications/squareone/values-roe.yaml
@@ -34,27 +34,77 @@ config:
 
       ## Data documentation
 
+      ### DP0.3
+      <CardGroup>
+        <a href="https://dp0-3.lsst.io/">
+          <Card>
+            ### Data Preview 0.3 (DP0.3)
+            DP0.3 provides a catalog of solar system objects from a simulated 
+            LSST ten-year wide-fast-deep survey by the Solar System Science 
+            Collaboration.
+          </Card>
+        </a>
+        <a href="https://dp0-3.lsst.io/tutorials-dp0-3/index.html">
+          <Card>
+            ### DP0.3 Tutorials
+            Tutorials for exploring the DP0.3 solar system object dataset on
+            the Rubin Science Platform.
+          </Card>
+        </a>
+        <a href="https://dm.lsst.org/sdm_schemas/browser/dp03.html">
+          <Card>
+            ### DP0.3 Catalog Schema
+            Schema reference for the DP0.3 catalog dataset available through
+            the Table Access Protocol (TAP) service.
+          </Card>
+        </a>
+      </CardGroup>
+      ### DP0.2
+      <CardGroup>
+        <a href="https://dp0-2.lsst.io/">
+          <Card>
+            ### Data Preview 0.2 (DP0.2)
+            DP0.2 is the second phase of the Data Preview 0 program using
+            simulated images from the DESC DC2 data challenge processed
+            with version 23.0 of the LSST Science Pipelines.
+          </Card>
+        </a>
+        <a href="https://dp0-2.lsst.io/tutorials-examples/index.html">
+          <Card>
+            ### DP0.2 Tutorials
+            Tutorials for exploring the DP0.2 dataset on the Rubin Science
+            Platform.
+          </Card>
+        </a>
+        <a href="https://dm.lsst.org/sdm_schemas/browser/dp02.html">
+          <Card>
+            ### DP0.2 Catalog Schema
+            Schema reference for the DP0.2 catalog dataset available through 
+            the Table Access Protocol (TAP) service.
+          </Card>
+        </a>
+      </CardGroup>
       ### GaiaXCatwise
 
       <CardGroup>
        <a href="https://rsp.lsst.ac.uk/portal/app/">
          <Card>
-           Table of counterpart associations between Gaia DR3 and CatWISE2020.
-           Uses probabilistic cross-match algorithms as described by Wilson & Naylor (MNRAS, 2017, 2018a,b) and Wilson (RNAAS, 2022).
+           Table of counterpart associations between Gaia DR3 and CatWISE2020. 
+           Uses probabilistic cross-match algorithms as described by Wilson & Naylor (MNRAS, 2017, 2018a,b) and Wilson (RNAAS, 2022). 
            Sources are returned either as a pairing, in which the Gaia and WISE objects are the same astrophysical source detected twice, or as non-matches, with that particular object in one of the catalogues having a corresponding flux upper limits in the opposing catalogue, and entries include various pieces of metadata such as the probability of the match/non-match, likelihood of match on purely position or brightness grounds, and information on the level to which objects suffer contamination due to hidden and unresolved background sources.
          </Card>
        </a>
       </CardGroup>
 
       ### VISTA-HSC
-
+      
       <CardGroup>
         <a href="https://rsp.lsst.ac.uk/portal/app/">
           <Card>
             The VISTA-HSC fused dataset is designed to deliver pixel-matched images and multiband catalogues through the integration of data from the Visible and Infrared Survey Telescope for Astronomy (VISTA) in the near-infrared and the Hyper SuprimeCam (HSC) in the optical range. The LSST pipelines will handle the CCD processing of VISTA images, while the calibrated exposures from the final HSC PDR3 will be employed for merging with VISTA. This comprehensive dataset encompasses multiple VISTA surveys, with varying depths.
           </Card>
         </a>
-      </CardGroup>
+      </CardGroup>       
 
     </Section>
 

diff --git a/applications/squareone/values-rsptest.yaml b/applications/squareone/values-rsptest.yaml
@@ -0,0 +1,6 @@
+config:
+  siteName: "Rubin Science Platform"
+  semaphoreUrl: "https://rsp-test.lsst.ac.uk/semaphore"
+
+ingress:
+  tls: false
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ resources:

		config:
		hipsUrl: "http://alasky.cds.unistra.fr/DSS/DSSColor"
		ssotap: "ssotap"