set up values files from prod

applications/argocd/values-rsptest.yaml

@@ -3,21 +3,9 @@ argo-cd:
     cm:
       url: "https://rsp-test.lsst.ac.uk/argo-cd"
     secret:
-      createSecret: true
+      createSecret: false
 
   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

applications/gafaelfawr/values-rsptest.yaml

@@ -3,47 +3,33 @@ redis:
     enabled: false
 
 config:
-  updateSchema: false
   internalDatabase: true
-  #databaseUrl: "postgresql://[email protected]/gafaelfawr"
+
+  oidcServer:
+    enabled: true
+
+  updateSchema: false
 
   github:
     clientId: "c4a5727c5788cc2d346e"
 
-  # Allow access by GitHub team.
   groupMapping:
     "exec:admin":
       - github:
           organization: "lsp-uk"
           team: "dev"
-    "exec:notebook":
+    "exec:internal-tools":
       - github:
           organization: "lsp-uk"
           team: "dev"
-    "exec:internal-tools":
+    "exec:notebook":
       - 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"
@@ -56,3 +42,4 @@ config:
   initialAdmins:
     - "gpfrancis"
     - "aibsen"
+    - "davedavemckay"

applications/ingress-nginx/values-rsptest.yaml

@@ -7,7 +7,7 @@ ingress-nginx:
       use-proxy-protocol: "false"
       enable-health-monitor: "false"
     service:
-      loadBalancerIP: "192.41.122.55"
+      loadBalancerIP: "192.41.122.244"
       annotations:
         kubernetes.io/ingress.class: "openstack"
         loadbalancer.openstack.org/enable-health-monitor: "false"

applications/nublado/values-rsptest.yaml

@@ -14,7 +14,7 @@ controller:
         - name: "inithome"
           image:
             repository: "ghcr.io/lsst-sqre/nublado-inithome"
-            tag: "4.0.2"
+            tag: "6.3.0"
           privileged: true
           volumeMounts:
             - containerPath: "/home"
@@ -55,7 +55,3 @@ jupyterhub:
   hub:
     db:
       upgrade: true
-  cull:
-    timeout: 432000
-    every: 300
-    maxAge: 2160000

applications/portal/values-rsptest.yaml

@@ -5,4 +5,5 @@ resources:
     memory: "8Gi"
 
 config:
-  hipsUrl: "http://thisdoesntexist.org"
+  hipsUrl: "http://alasky.cds.unistra.fr/DSS/DSSColor"
+  ssotap: "ssotap"

applications/postgres/values-rsptest.yaml

@@ -7,4 +7,4 @@ nublado3_db:
 gafaelfawr_db:
   user: "gafaelfawr"
   db: "gafaelfawr"
-postgresStorageClass: "standard"
+postgresStorageClass: "ceph-hdd"

applications/ssotap/values-rsptest.yaml

@@ -0,0 +1,14 @@
+cadc-tap:
+  tapSchema:
+    image:
+      repository: "lsstuk/tap-schema-roe-sso"
+      tag: "2.3.0"
+  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"

applications/tap/values-rsptest.yaml

@@ -1,10 +1,14 @@
-config:
-  gcsBucket: "async-test"
-  gcsBucketUrl: "https://somerville.ed.ac.uk:6780"
-  gcsBucketType: "S3"
-  jvmMaxHeapSize: "31G"
+cadc-tap:
+  tapSchema:
+    image:
+      repository: "lsstuk/tap-schema-roe"
+      tag: "2.3.0"
 
-qserv:
-  host: "192.41.122.79:30040"
-  mock:
-    enabled: false
+  config:
+    gcsBucket: "async-test"
+    gcsBucketUrl: "https://somerville.ed.ac.uk:6780"
+    gcsBucketType: "S3"
+    jvmMaxHeapSize: "31G"
+
+    qserv:
+      host: "192.41.122.85:30040"

applications/vault-secrets-operator/values-rsptest.yaml

@@ -1,28 +1,14 @@
-# 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
+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

environments/values-rsptest.yaml

@@ -5,12 +5,10 @@ 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
-
+  ssotap: true