From 5a13c5100f4391e6c26b4ea634fd03052799f570 Mon Sep 17 00:00:00 2001 From: Fritz Mueller Date: Fri, 23 Aug 2024 09:09:33 -0700 Subject: [PATCH] cm-service: remove redis --- applications/cm-service/Chart.yaml | 5 ----- applications/cm-service/README.md | 2 -- applications/cm-service/secrets.yaml | 14 +++----------- applications/cm-service/templates/deployment.yaml | 7 ------- .../cm-service/templates/vault-secrets.yaml | 13 ------------- .../cm-service/templates/worker-deployment.yaml | 8 -------- applications/cm-service/values.yaml | 9 --------- 7 files changed, 3 insertions(+), 55 deletions(-) diff --git a/applications/cm-service/Chart.yaml b/applications/cm-service/Chart.yaml index ad1b2ef5a1..ede07c7126 100644 --- a/applications/cm-service/Chart.yaml +++ b/applications/cm-service/Chart.yaml @@ -6,8 +6,3 @@ sources: - https://github.com/lsst-dm/cm-service type: application version: 1.0.0 - -dependencies: -- name: redis - version: 1.0.13 - repository: https://lsst-sqre.github.io/charts/ diff --git a/applications/cm-service/README.md b/applications/cm-service/README.md index 88b43969e7..9f720ea79d 100644 --- a/applications/cm-service/README.md +++ b/applications/cm-service/README.md @@ -30,8 +30,6 @@ Campaign Management for Rubin Data Release Production | image.repository | string | `"ghcr.io/lsst-dm/cm-service"` | Image to use for frontend containers | | image.tag | string | The appVersion of the chart | Tag of frontend image to use | | ingress.annotations | object | `{}` | Additional annotations for the frontend ingress rule | -| redis.config.secretKey | string | `"password"` | Key inside secret from which to get the Redis password (do not change) | -| redis.config.secretName | string | `"redis-secret"` | Name of secret containing Redis password | | worker.affinity | object | `{}` | Affinity rules for the worker pods | | worker.htcondor.config.contents | string | `nil` | If specified, contents of htcondor config file to be injected into worker containers | | worker.htcondor.config.mountPath | string | `nil` | If specified, location for htcondor config file to be injected into worker containers | diff --git a/applications/cm-service/secrets.yaml b/applications/cm-service/secrets.yaml index 414e59c34f..681ae4c8a3 100644 --- a/applications/cm-service/secrets.yaml +++ b/applications/cm-service/secrets.yaml @@ -1,16 +1,8 @@ -redis-password: - description: >- - Password used to authenticate cm-service to its internal Redis server, - deployed as part of the same Argo CD application. This secret can be - changed at any time, but both the Redis server and the cm-service - deployments will then have to be restarted to pick up the new value. - generate: - type: password postgres-password: description: >- Password used to authenticate cm-service to its internal cnpg Postgres - server, deployed as part of the same Argo CD application. This secret can - be changed at any time, but both the Redis server and the cm-service - deployments will then have to be restarted to pick up the new value. + server, deployed as part of the same Argo CD application. This secret can be + changed at any time, but the cm-service deployments will then have to be + restarted to pick up the new value. generate: type: password diff --git a/applications/cm-service/templates/deployment.yaml b/applications/cm-service/templates/deployment.yaml index b50e8277eb..bfe3b38d8a 100644 --- a/applications/cm-service/templates/deployment.yaml +++ b/applications/cm-service/templates/deployment.yaml @@ -28,11 +28,6 @@ spec: containers: - name: "cm-service" env: - - name: CM_ARQ_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: redis-secret - key: password - name: CM_DATABASE_PASSWORD valueFrom: secretKeyRef: @@ -48,8 +43,6 @@ spec: value: {{ .Values.config.logProfile | quote }} - name: CM_LOG_LEVEL value: {{ .Values.config.logLevel | quote }} - - name: CM_ARQ_REDIS_URL - value: "redis://cm-service-redis/1" image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: diff --git a/applications/cm-service/templates/vault-secrets.yaml b/applications/cm-service/templates/vault-secrets.yaml index 26f72b46e6..996a6617d8 100644 --- a/applications/cm-service/templates/vault-secrets.yaml +++ b/applications/cm-service/templates/vault-secrets.yaml @@ -1,18 +1,5 @@ apiVersion: ricoberger.de/v1alpha1 kind: VaultSecret -metadata: - name: redis-secret - labels: - {{- include "cm-service.labels" . | nindent 4 }} -spec: - path: "{{ .Values.global.vaultSecretsPath }}/cm-service" - templates: - password: >- - {% index .Secrets "redis-password" %} - type: Opaque ---- -apiVersion: ricoberger.de/v1alpha1 -kind: VaultSecret metadata: name: postgres-secret labels: diff --git a/applications/cm-service/templates/worker-deployment.yaml b/applications/cm-service/templates/worker-deployment.yaml index e0bce6f8c1..3218cd651d 100644 --- a/applications/cm-service/templates/worker-deployment.yaml +++ b/applications/cm-service/templates/worker-deployment.yaml @@ -27,14 +27,6 @@ spec: automountServiceAccountToken: false containers: - name: "cm-service-worker" - env: - - name: CM_ARQ_REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: redis-secret - key: password - - name: CM_ARQ_REDIS_URL - value: "redis://cm-service-redis/1" image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} resources: diff --git a/applications/cm-service/values.yaml b/applications/cm-service/values.yaml index 363b8a4e25..ae260853f4 100644 --- a/applications/cm-service/values.yaml +++ b/applications/cm-service/values.yaml @@ -129,15 +129,6 @@ worker: # -- If specified, location for htcondor schedd address file to be injected into worker pods contents: null -redis: - config: - # -- Name of secret containing Redis password - secretName: "redis-secret" - - # -- Key inside secret from which to get the Redis password (do not - # change) - secretKey: "password" - # The following will be set by parameters injected by Argo CD and should not # be set in the individual environment values files. global: