From 1ccff3ba3f81cb7bcbe40a618002ac5df7b15f94 Mon Sep 17 00:00:00 2001 From: Stelios Voutsinas Date: Tue, 27 Aug 2024 11:53:29 +0000 Subject: [PATCH 1/5] add rsptest values files --- applications/argocd/values-rsptest.yaml | 23 +++++++ applications/cert-manager/values-rsptest.yaml | 7 +++ applications/exposurelog/values-rsptest.yaml | 8 +++ applications/gafaelfawr/values-rsptest.yaml | 55 +++++++++++++++++ .../ingress-nginx/values-rsptest.yaml | 17 ++++++ applications/mobu/values-rsptest.yaml | 48 +++++++++++++++ applications/nublado/values-rsptest.yaml | 61 +++++++++++++++++++ applications/portal/values-rsptest.yaml | 8 +++ applications/postgres/values-rsptest.yaml | 10 +++ applications/semaphore/values-rsptest.yaml | 11 ++++ applications/squareone/values-rsptest.yaml | 6 ++ applications/tap/values-rsptest.yaml | 10 +++ .../values-rsptest.yaml | 28 +++++++++ environments/values-rsptest.yaml | 16 +++++ 14 files changed, 308 insertions(+) create mode 100644 applications/argocd/values-rsptest.yaml create mode 100644 applications/cert-manager/values-rsptest.yaml create mode 100644 applications/exposurelog/values-rsptest.yaml create mode 100644 applications/gafaelfawr/values-rsptest.yaml create mode 100644 applications/ingress-nginx/values-rsptest.yaml create mode 100644 applications/mobu/values-rsptest.yaml create mode 100644 applications/nublado/values-rsptest.yaml create mode 100644 applications/portal/values-rsptest.yaml create mode 100644 applications/postgres/values-rsptest.yaml create mode 100644 applications/semaphore/values-rsptest.yaml create mode 100644 applications/squareone/values-rsptest.yaml create mode 100644 applications/tap/values-rsptest.yaml create mode 100644 applications/vault-secrets-operator/values-rsptest.yaml create mode 100644 environments/values-rsptest.yaml 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-rsptest.yaml b/applications/gafaelfawr/values-rsptest.yaml new file mode 100644 index 0000000000..8a9565d08b --- /dev/null +++ b/applications/gafaelfawr/values-rsptest.yaml @@ -0,0 +1,55 @@ +redis: + persistence: + enabled: false + +# config: +# 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: + - "stvoutsin" 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-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-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-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/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-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-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 + From 06f13567095c31cd503ce61d20b5a997a292b05d Mon Sep 17 00:00:00 2001 From: G Francis Date: Wed, 4 Sep 2024 10:18:32 +0000 Subject: [PATCH 2/5] update gafaelfawr database config --- applications/gafaelfawr/values-rsptest.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/gafaelfawr/values-rsptest.yaml b/applications/gafaelfawr/values-rsptest.yaml index 8a9565d08b..2ec4d226b4 100644 --- a/applications/gafaelfawr/values-rsptest.yaml +++ b/applications/gafaelfawr/values-rsptest.yaml @@ -2,8 +2,10 @@ redis: persistence: enabled: false -# config: -# databaseUrl: "postgresql://gafaelfawr@postgres.postgres/gafaelfawr" +config: + updateSchema: true + internalDatabase: true + #databaseUrl: "postgresql://gafaelfawr@postgres.postgres/gafaelfawr" github: clientId: "c4a5727c5788cc2d346e" @@ -52,4 +54,5 @@ redis: team: "dev" initialAdmins: - - "stvoutsin" + - "gpfrancis" + - "aibsen" From c2cbd2ef51085ed62b21b93b9f2acf7172bdd33e Mon Sep 17 00:00:00 2001 From: G Francis Date: Wed, 4 Sep 2024 10:24:24 +0000 Subject: [PATCH 3/5] disable gafaelfawr schema update --- applications/gafaelfawr/values-rsptest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/gafaelfawr/values-rsptest.yaml b/applications/gafaelfawr/values-rsptest.yaml index 2ec4d226b4..e199cbc66d 100644 --- a/applications/gafaelfawr/values-rsptest.yaml +++ b/applications/gafaelfawr/values-rsptest.yaml @@ -3,7 +3,7 @@ redis: enabled: false config: - updateSchema: true + updateSchema: false internalDatabase: true #databaseUrl: "postgresql://gafaelfawr@postgres.postgres/gafaelfawr" From 96bcb19c70dd77f10f9030dd80eafacd1fef57ec Mon Sep 17 00:00:00 2001 From: G Francis Date: Wed, 4 Sep 2024 10:34:59 +0000 Subject: [PATCH 4/5] set update schema true --- applications/gafaelfawr/values-rsptest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/gafaelfawr/values-rsptest.yaml b/applications/gafaelfawr/values-rsptest.yaml index e199cbc66d..66cf4dd585 100644 --- a/applications/gafaelfawr/values-rsptest.yaml +++ b/applications/gafaelfawr/values-rsptest.yaml @@ -3,9 +3,9 @@ redis: enabled: false config: - updateSchema: false + updateSchema: true internalDatabase: true - #databaseUrl: "postgresql://gafaelfawr@postgres.postgres/gafaelfawr" + #databaseUrl: "postgresql://gafaelfawr@postgres.postgres/gafaelfawr" github: clientId: "c4a5727c5788cc2d346e" From 929aedfe641dd130fa4c7cd7458dabd507b95ce4 Mon Sep 17 00:00:00 2001 From: G Francis Date: Wed, 4 Sep 2024 10:36:55 +0000 Subject: [PATCH 5/5] set update schema false --- applications/gafaelfawr/values-rsptest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/gafaelfawr/values-rsptest.yaml b/applications/gafaelfawr/values-rsptest.yaml index 66cf4dd585..91115829f6 100644 --- a/applications/gafaelfawr/values-rsptest.yaml +++ b/applications/gafaelfawr/values-rsptest.yaml @@ -3,7 +3,7 @@ redis: enabled: false config: - updateSchema: true + updateSchema: false internalDatabase: true #databaseUrl: "postgresql://gafaelfawr@postgres.postgres/gafaelfawr"