Merge pull request #421 from dod-ccpo/update-uat-env

Update UAT environment

atst/app.py

@@ -102,7 +102,7 @@ def map_config(config):
         ),
         "REQUIRE_CRLS": config.getboolean("default", "REQUIRE_CRLS"),
         "RQ_REDIS_URL": config["default"]["REDIS_URI"],
-        "RQ_QUEUES": ["atat_{}".format(ENV.lower())],
+        "RQ_QUEUES": [config["default"]["RQ_QUEUES"]],
     }
 
 

config/base.ini

@@ -16,6 +16,7 @@ PGUSER = postgres
 PORT=8000
 REDIS_URI = redis://localhost:6379
 REQUIRE_CRLS = true
+RQ_QUEUES = atat_%(ENVIRONMENT)s
 SECRET = change_me_into_something_secret
 SECRET_KEY = change_me_into_something_secret
 SESSION_COOKIE_NAME=atat

deploy/kubernetes/uat/atst-envvars-configmap.yml

@@ -8,3 +8,4 @@ data:
   FLASK_ENV: dev
   OVERRIDE_CONFIG_FULLPATH: /opt/atat/atst/atst-overrides.ini
   UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi-config.ini
+  RQ_QUEUES: atat-uat

deploy/kubernetes/uat/atst-worker-envvars-configmap.yml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: atst-worker-envvars
+  namespace: atat-uat
+data:
+  REQUIRE_CRLS: "False"

deploy/kubernetes/uat/uat.yml

@@ -24,7 +24,7 @@ spec:
         fsGroup: 101
       containers:
         - name: atst
-          image: registry.atat.codes:443/atst-prod:76854ac
+          image: registry.atat.codes:443/atst-prod:a9fc2bd2
           resources:
             requests:
                memory: "2500Mi"
@@ -125,6 +125,51 @@ spec:
           emptyDir:
             medium: Memory
 ---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: atst
+  name: atst-worker
+  namespace: atat-uat
+spec:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: atst
+    spec:
+      securityContext:
+        fsGroup: 101
+      containers:
+        - name: atst-worker
+          image: registry.atat.codes:443/atst-prod:a9fc2bd2
+          args: ["/bin/bash", "-c", "/opt/atat/atst/script/rq_worker"]
+          resources:
+            requests:
+               memory: "500Mi"
+          envFrom:
+          - configMapRef:
+              name: atst-envvars
+          - configMapRef:
+              name: atst-worker-envvars
+          volumeMounts:
+            - name: atst-config
+              mountPath: "/opt/atat/atst/atst-overrides.ini"
+              subPath: atst-overrides.ini
+      imagePullSecrets:
+        - name: regcred
+      volumes:
+        - name: atst-config
+          secret:
+            secretName: atst-config-ini
+            items:
+            - key: override.ini
+              path: atst-overrides.ini
+              mode: 0644
+---
 apiVersion: v1
 kind: Service
 metadata: