diff --git a/applications/cachemachine/values-base.yaml b/applications/cachemachine/values-base.yaml deleted file mode 100644 index 2a5640986d..0000000000 --- a/applications/cachemachine/values-base.yaml +++ /dev/null @@ -1,25 +0,0 @@ -autostart: - jupyter: | - { - "name": "jupyter", - "labels": { - "jupyterlab": "ok" - }, - "repomen": [ - { - "type": "RubinRepoMan", - "registry_url": "ts-dockerhub.lsst.org", - "repo": "sal-sciplat-lab", - "recommended_tag": "recommended_c0032", - "num_releases": 0, - "num_weeklies": 3, - "num_dailies": 2, - "cycle": 32, - "alias_tags": [ - "latest", - "latest_daily", - "latest_weekly" - ] - } - ] - } diff --git a/applications/cachemachine/values-tucson-teststand.yaml b/applications/cachemachine/values-tucson-teststand.yaml deleted file mode 100644 index f88f37ba79..0000000000 --- a/applications/cachemachine/values-tucson-teststand.yaml +++ /dev/null @@ -1,23 +0,0 @@ -autostart: - jupyter: | - { - "name": "jupyter", - "labels": {}, - "repomen": [ - { - "type": "RubinRepoMan", - "registry_url": "ts-dockerhub.lsst.org", - "repo": "sal-sciplat-lab", - "recommended_tag": "recommended_c0032", - "num_releases": 1, - "num_weeklies": 3, - "num_dailies": 2, - "cycle": 32, - "alias_tags": [ - "latest", - "latest_daily", - "latest_weekly" - ] - } - ] - } diff --git a/applications/moneypenny/values-base.yaml b/applications/moneypenny/values-base.yaml deleted file mode 100644 index e8bf412e25..0000000000 --- a/applications/moneypenny/values-base.yaml +++ /dev/null @@ -1,15 +0,0 @@ -orders: - commission: - - name: initcommission - image: lsstsqre/inituserhome - securityContext: - runAsUser: 0 - runAsNonRootUser: false - volumeMounts: - - mountPath: /homedirs - name: homedirs - volumes: - - name: homedirs - nfs: - server: nfs-jhome.ls.lsst.org - path: /jhome diff --git a/applications/moneypenny/values-tucson-teststand.yaml b/applications/moneypenny/values-tucson-teststand.yaml deleted file mode 100644 index 845233c931..0000000000 --- a/applications/moneypenny/values-tucson-teststand.yaml +++ /dev/null @@ -1,15 +0,0 @@ -orders: - commission: - - name: initcommission - image: lsstsqre/inituserhome - securityContext: - runAsUser: 0 - runAsNonRootUser: false - volumeMounts: - - mountPath: /homedirs - name: homedirs - volumes: - - name: homedirs - nfs: - server: nfs-jhome.tu.lsst.org - path: /jhome diff --git a/applications/nublado2/values-base.yaml b/applications/nublado2/values-base.yaml deleted file mode 100644 index f546535e2f..0000000000 --- a/applications/nublado2/values-base.yaml +++ /dev/null @@ -1,81 +0,0 @@ -jupyterhub: - cull: - enabled: true - users: false - removeNamedServers: false - timeout: 432000 - every: 300 - maxAge: 2160000 - ingress: - hosts: ["base-lsp.lsst.codes"] - annotations: - nginx.ingress.kubernetes.io/auth-signin: "https://base-lsp.lsst.codes/login" - singleuser: - extraAnnotations: - k8s.v1.cni.cncf.io/networks: "kube-system/dds" - hub: - baseUrl: "/n2" - db: - upgrade: true - url: "postgresql://jovyan@postgresdb01.ls.lsst.org/jupyterhub" - -config: - base_url: "https://base-lsp.lsst.codes" - butler_secret_path: "secret/k8s_operator/base-lsp.lsst.codes/butler-secret" - pull_secret_path: "secret/k8s_operator/base-lsp.lsst.codes/pull-secret" - lab_environment: - AUTO_REPO_URLS: "https://github.com/lsst-sqre/system-test" - AUTO_REPO_BRANCH: "prod" - AUTO_REPO_SPECS: "https://github.com/lsst-sqre/system-test@prod" - DAF_BUTLER_REPOSITORY_INDEX: "/project/data-repos.yaml" - LSST_DDS_INTERFACE: net1 - LSST_DDS_PARTITION_PREFIX: base - LSST_SITE: base - PGPASSFILE: "/opt/lsst/software/jupyterlab/butler-secret/postgres-credentials.txt" - PGUSER: "oods" - volumes: - - name: home - nfs: - path: /jhome - server: nfs-jhome.ls.lsst.org - - name: project - nfs: - path: /project - server: nfs-project.ls.lsst.org - - name: scratch - nfs: - path: /scratch - server: nfs-scratch.ls.lsst.org - - name: datasets - nfs: - path: /lsstdata - server: nfs-lsstdata.ls.lsst.org - - name: auxtel-butler - nfs: - path: /auxtel/repo/LATISS - server: nfs-auxtel.ls.lsst.org - - name: auxtel-oods - nfs: - path: /auxtel/lsstdata/BTS/auxtel - server: nfs-auxtel.ls.lsst.org - readOnly: true - - name: obs-env - nfs: - path: /obs-env - server: nfs-obsenv.ls.lsst.org - volume_mounts: - - name: home - mountPath: /home - - name: datasets - mountPath: /datasets - - name: project - mountPath: /project - - name: scratch - mountPath: /scratch - - name: auxtel-butler - mountPath: /repo/LATISS - - name: auxtel-oods - mountPath: /data/lsstdata/BTS/auxtel - readOnly: true - - name: obs-env - mountPath: /net/obs-env diff --git a/applications/nublado2/values-tucson-teststand.yaml b/applications/nublado2/values-tucson-teststand.yaml deleted file mode 100644 index 1594760b74..0000000000 --- a/applications/nublado2/values-tucson-teststand.yaml +++ /dev/null @@ -1,95 +0,0 @@ -jupyterhub: - cull: - enabled: true - users: false - removeNamedServers: false - timeout: 432000 - every: 300 - maxAge: 2160000 - ingress: - hosts: ["tucson-teststand.lsst.codes"] - annotations: - nginx.ingress.kubernetes.io/auth-signin: "https://tucson-teststand.lsst.codes/login" - singleuser: - extraAnnotations: - k8s.v1.cni.cncf.io/networks: "kube-system/dds" - hub: - baseUrl: "/n2" - db: - upgrade: true - url: "postgresql://jovyan@squoint.tu.lsst.org/jupyterhub" - -config: - base_url: "https://tucson-teststand.lsst.codes" - butler_secret_path: "secret/k8s_operator/tucson-teststand.lsst.codes/butler-secret" - pull_secret_path: "secret/k8s_operator/tucson-teststand.lsst.codes/pull-secret" - lab_environment: - AUTO_REPO_URLS: "https://github.com/lsst-sqre/system-test" - AUTO_REPO_BRANCH: "prod" - AUTO_REPO_SPECS: "https://github.com/lsst-sqre/system-test@prod" - DAF_BUTLER_REPOSITORY_INDEX: "/project/data-repos.yaml" - LSST_DDS_INTERFACE: net1 - LSST_DDS_PARTITION_PREFIX: tucson - LSST_SITE: tucson - PGPASSFILE: "/opt/lsst/software/jupyterlab/butler-secret/postgres-credentials.txt" - PGUSER: "oods" - volumes: - - name: home - nfs: - path: /jhome - server: nfs-jhome.tu.lsst.org - - name: project - nfs: - path: /project - server: nfs-project.tu.lsst.org - - name: scratch - nfs: - path: /scratch - server: nfs-scratch.tu.lsst.org - - name: datasets - nfs: - path: /lsstdata - server: nfs-lsstdata.tu.lsst.org - - name: auxtel-butler - nfs: - path: /auxtel/repo/LATISS - server: nfs-auxtel.tu.lsst.org - - name: auxtel-oods - nfs: - path: /auxtel/lsstdata/TTS/auxtel - server: nfs-auxtel.tu.lsst.org - readOnly: true - - name: comcam-butler - nfs: - path: /repo/LSSTComCam - server: comcam-archiver.tu.lsst.org - - name: comcam-oods - nfs: - path: /lsstdata/TTS/comcam - server: comcam-archiver.tu.lsst.org - readOnly: true - - name: obs-env - nfs: - path: /obs-env - server: nfs-obsenv.tu.lsst.org - volume_mounts: - - name: home - mountPath: /home - - name: datasets - mountPath: /datasets - - name: project - mountPath: /project - - name: scratch - mountPath: /scratch - - name: auxtel-butler - mountPath: /repo/LATISS - - name: auxtel-oods - mountPath: /data/lsstdata/TTS/auxtel - readOnly: true - - name: comcam-butler - mountPath: /repo/LSSTComCam - - name: comcam-oods - mountPath: /data/lsstdata/TTS/comcam - readOnly: true - - name: obs-env - mountPath: /net/obs-env diff --git a/applications/sasquatch/values-base.yaml b/applications/sasquatch/values-base.yaml index ba96c6ff6b..907f25f040 100644 --- a/applications/sasquatch/values-base.yaml +++ b/applications/sasquatch/values-base.yaml @@ -133,7 +133,7 @@ kafka-connect-manager: topicsRegex: "lsst.sal.MTCamera|lsst.sal.MTHeaderService|lsst.sal.MTOODS" telegraf-kafka-consumer: - enabled: true + enabled: false kafkaConsumers: auxtel: enabled: true diff --git a/applications/sasquatch/values-summit.yaml b/applications/sasquatch/values-summit.yaml index 3ea7944186..a82397b46d 100644 --- a/applications/sasquatch/values-summit.yaml +++ b/applications/sasquatch/values-summit.yaml @@ -119,7 +119,7 @@ kafka-connect-manager: topicsRegex: ".*LaserTracker" telegraf-kafka-consumer: - enabled: true + enabled: false kafkaConsumers: auxtel: enabled: true diff --git a/applications/sasquatch/values-tucson-teststand.yaml b/applications/sasquatch/values-tucson-teststand.yaml index 7cc7292865..cd2e0e01bd 100644 --- a/applications/sasquatch/values-tucson-teststand.yaml +++ b/applications/sasquatch/values-tucson-teststand.yaml @@ -43,7 +43,7 @@ influxdb2: hostname: tucson-teststand.lsst.codes telegraf-kafka-consumer: - enabled: true + enabled: false kafkaConsumers: auxtel: enabled: true diff --git a/environments/values-base.yaml b/environments/values-base.yaml index 67f73d44a9..1b0108032f 100644 --- a/environments/values-base.yaml +++ b/environments/values-base.yaml @@ -4,12 +4,9 @@ vaultPathPrefix: secret/k8s_operator/base-lsp.lsst.codes applications: argo-workflows: true - cachemachine: true exposurelog: true - moneypenny: true narrativelog: true nublado: true - nublado2: true portal: true sasquatch: true squareone: true diff --git a/environments/values-tucson-teststand.yaml b/environments/values-tucson-teststand.yaml index d1fa87345a..03e0136f74 100644 --- a/environments/values-tucson-teststand.yaml +++ b/environments/values-tucson-teststand.yaml @@ -4,12 +4,9 @@ vaultPathPrefix: secret/k8s_operator/tucson-teststand.lsst.codes applications: argo-workflows: true - cachemachine: true exposurelog: true - moneypenny: true narrativelog: true nublado: true - nublado2: true portal: true sasquatch: true squareone: true