Merge pull request #3637 from lsst-sqre/tickets/DM-45965

DM-45965: cm-service: remove arq/redis

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/

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 |

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

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:

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:

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:

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: