Merge pull request #2060 from amazeeio/api-redis-password

add redis-password

.lagoon.secrets.yaml

@@ -32,6 +32,10 @@ parameters:
     description: Password used for connecting to the keycloak-db
     generate: expression
     from: "[a-zA-Z0-9]{32}"
+  - name: API_REDIS_PASSWORD
+    description: Password used for connecting to the api-redis
+    generate: expression
+    from: "[a-zA-Z0-9]{32}"
   - name: SAFE_BRANCH
     description: Which branch this belongs to, special chars replaced with dashes
     required: true
@@ -99,3 +103,9 @@ objects:
     name: opendistro-security-cookie-password
   stringData:
     OPENDISTRO_SECURITY_COOKIE_PASSWORD: ${OPENDISTRO_SECURITY_COOKIE_PASSWORD}
+- kind: Secret
+  apiVersion: v1
+  metadata:
+    name: api-redis-password
+  stringData:
+    API_REDIS_PASSWORD: ${API_REDIS_PASSWORD}

services/api-redis/.lagoon.app.yml

@@ -97,6 +97,11 @@ objects:
             value: ${SERVICE_NAME}
           - name: CRONJOBS
             value: ${CRONJOBS}
+          - name: REDIS_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: api-redis-password
+                key: API_REDIS_PASSWORD
           resources:
             requests:
               cpu: 10m

services/api-redis/Dockerfile

@@ -1,2 +1,4 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/redis
+
+ENV REDIS_PASSWORD=admin

services/api/.lagoon.app.yml

@@ -134,6 +134,11 @@ objects:
                 secretKeyRef:
                   name: api-db-password
                   key: API_DB_PASSWORD
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: api-redis-password
+                  key: API_REDIS_PASSWORD
             - name: SERVICE_NAME
               value: ${SERVICE_NAME}
             - name: CRONJOBS

services/api/Dockerfile

@@ -28,7 +28,8 @@ ENV NODE_ENV=production \
     ELASTICSEARCH_HOST=logs-db-service:9200 \
     ELASTICSEARCH_URL=http://logs-db-service:9200 \
     KEYCLOAK_API_CLIENT_SECRET=39d5282d-3684-4026-b4ed-04bbc034b61a \
-    HARBOR_ADMIN_PASSWORD=admin
+    HARBOR_ADMIN_PASSWORD=admin \
+    REDIS_PASSWORD=admin
 
 # The API is not very resilient to sudden mariadb restarts which can happen when the api and mariadb are starting
 # at the same time. So we have a small entrypoint which waits for mariadb to be fully ready.