diff --git a/applications/argocd/values-rsptest.yaml b/applications/argocd/values-rsptest.yaml new file mode 100644 index 0000000000..0ea3d41ddb --- /dev/null +++ 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 new file mode 100644 index 0000000000..cf9a361f4d --- /dev/null +++ b/applications/cert-manager/values-rsptest.yaml @@ -0,0 +1,7 @@ +config: + createIssuer: false +# config: +# email: "rsp@rsptest.ac.uk" +# route53: +# awsAccessKeyId: "AKIAQSJOS2SFL5I4TYND" +# hostedZone: "Z0567328105IEHEMIXLCO" diff --git a/applications/exposurelog/values-rsptest.yaml b/applications/exposurelog/values-rsptest.yaml new file mode 100644 index 0000000000..d003906f49 --- /dev/null +++ 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 index f53b9e0ead..014b1ddf2a 100644 --- 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 new file mode 100644 index 0000000000..91115829f6 --- /dev/null +++ b/applications/gafaelfawr/values-rsptest.yaml @@ -0,0 +1,58 @@ +redis: + persistence: + enabled: false + +config: + updateSchema: false + internalDatabase: true + #databaseUrl: "postgresql://gafaelfawr@postgres.postgres/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 index e2e549ef68..57d502af02 100644 --- 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 new file mode 100644 index 0000000000..da704334e6 --- /dev/null +++ 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 new file mode 100644 index 0000000000..6765df0300 --- /dev/null +++ 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 new file mode 100644 index 0000000000..59445fe3b3 --- /dev/null +++ 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 index 787f7a9638..f030ba5b8d 100644 --- 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 new file mode 100644 index 0000000000..5c926db883 --- /dev/null +++ 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 index b827fda643..376aec149b 100644 --- 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 new file mode 100644 index 0000000000..b827fda643 --- /dev/null +++ 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 new file mode 100644 index 0000000000..e1dd25028c --- /dev/null +++ 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 index d9f0d841ba..48c18ddf79 100644 --- a/applications/squareone/values-roe.yaml +++ b/applications/squareone/values-roe.yaml @@ -34,27 +34,77 @@ config: ## Data documentation + ### DP0.3 + + + + ### 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. + + + + + ### DP0.3 Tutorials + Tutorials for exploring the DP0.3 solar system object dataset on + the Rubin Science Platform. + + + + + ### DP0.3 Catalog Schema + Schema reference for the DP0.3 catalog dataset available through + the Table Access Protocol (TAP) service. + + + + ### DP0.2 + + + + ### 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. + + + + + ### DP0.2 Tutorials + Tutorials for exploring the DP0.2 dataset on the Rubin Science + Platform. + + + + + ### DP0.2 Catalog Schema + Schema reference for the DP0.2 catalog dataset available through + the Table Access Protocol (TAP) service. + + + ### GaiaXCatwise - 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. ### VISTA-HSC - + 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. - + diff --git a/applications/squareone/values-rsptest.yaml b/applications/squareone/values-rsptest.yaml new file mode 100644 index 0000000000..2bd2e6913e --- /dev/null +++ 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 diff --git a/applications/ssotap/values-roe.yaml b/applications/ssotap/values-roe.yaml new file mode 100644 index 0000000000..e5b3eb69a4 --- /dev/null +++ b/applications/ssotap/values-roe.yaml @@ -0,0 +1,16 @@ +cadc-tap: + tapSchema: + image: + repository: "lsstuk/tap-schema-roe-sso" + + config: + gcsBucket: "async" + gcsBucketUrl: "https://somerville.ed.ac.uk:6780" + gcsBucketType: "S3" + + pg: + host: "192.41.122.118:5432" + database: "dp03_catalogs_10yr" + username: "dp03_user" + + vaultSecretName: "ssotap" diff --git a/applications/tap/values-roe.yaml b/applications/tap/values-roe.yaml index 34abee38bf..40432ed6cc 100644 --- a/applications/tap/values-roe.yaml +++ b/applications/tap/values-roe.yaml @@ -7,6 +7,7 @@ cadc-tap: gcsBucket: "async" gcsBucketUrl: "https://somerville.ed.ac.uk:6780" gcsBucketType: "S3" - + jvmMaxHeapSize: "31G" + qserv: host: "192.41.122.85:30040" diff --git a/applications/tap/values-rsptest.yaml b/applications/tap/values-rsptest.yaml new file mode 100644 index 0000000000..9fb3e0cf86 --- /dev/null +++ b/applications/tap/values-rsptest.yaml @@ -0,0 +1,10 @@ +config: + gcsBucket: "async-test" + gcsBucketUrl: "https://somerville.ed.ac.uk:6780" + gcsBucketType: "S3" + jvmMaxHeapSize: "31G" + +qserv: + host: "192.41.122.79:30040" + mock: + enabled: false diff --git a/applications/vault-secrets-operator/values-roe.yaml b/applications/vault-secrets-operator/values-roe.yaml index e69de29bb2..1e40e6f933 100644 --- a/applications/vault-secrets-operator/values-roe.yaml +++ b/applications/vault-secrets-operator/values-roe.yaml @@ -0,0 +1,14 @@ +vault-secrets-operator: + environmentVars: + - name: VAULT_ROLE_ID + valueFrom: + secretKeyRef: + name: vault-credentials + key: VAULT_ROLE_ID + - name: VAULT_SECRET_ID + valueFrom: + secretKeyRef: + name: vault-credentials + key: VAULT_SECRET_ID + vault: + authMethod: approle diff --git a/applications/vault-secrets-operator/values-rsptest.yaml b/applications/vault-secrets-operator/values-rsptest.yaml new file mode 100644 index 0000000000..b304867c64 --- /dev/null +++ b/applications/vault-secrets-operator/values-rsptest.yaml @@ -0,0 +1,28 @@ +# vault-secrets-operator: +# environmentVars: +# - name: VAULT_TOKEN +# valueFrom: +# secretKeyRef: +# name: vault-secrets-operator +# key: VAULT_TOKEN +# - name: VAULT_TOKEN_LEASE_DURATION +# valueFrom: +# secretKeyRef: +# name: vault-secrets-operator +# key: VAULT_TOKEN_LEASE_DURATION +# vault: +# address: "https://vault.lsst.ac.uk" +vault-secrets-operator: + environmentVars: + - name: VAULT_ROLE_ID + valueFrom: + secretKeyRef: + name: vault-credentials + key: VAULT_ROLE_ID + - name: VAULT_SECRET_ID + valueFrom: + secretKeyRef: + name: vault-credentials + key: VAULT_SECRET_ID + vault: + authMethod: approle diff --git a/environments/values-roe.yaml b/environments/values-roe.yaml index 8759014a8d..4bdd211bbb 100644 --- a/environments/values-roe.yaml +++ b/environments/values-roe.yaml @@ -2,7 +2,7 @@ name: "roe" fqdn: "rsp.lsst.ac.uk" appOfAppsName: "science-platform" vaultUrl: "https://vault.lsst.ac.uk" -vaultPathPrefix: "secret/k8s_operator/roe" +vaultPathPrefix: "kv-v2/k8s_operator/roe" applications: mobu: true @@ -11,3 +11,4 @@ applications: postgres: true squareone: true tap: true + ssotap: true diff --git a/environments/values-rsptest.yaml b/environments/values-rsptest.yaml new file mode 100644 index 0000000000..69897cc0ee --- /dev/null +++ b/environments/values-rsptest.yaml @@ -0,0 +1,16 @@ +name: "rsptest" +fqdn: "rsp-test.lsst.ac.uk" +appOfAppsName: "science-platform" +vaultUrl: "https://vault.lsst.ac.uk" +vaultPathPrefix: kv-v2/k8s_operator/rsptest + +applications: + # cert-manager: false + # ingress-nginx: true + mobu: true + nublado: true + portal: true + postgres: true + squareone: true + tap: true +