move staging to new rabbit MQ.

DARPA-ASKEM · May 7, 2024 · 8bd7c7f · 8bd7c7f
1 parent 37a10dc
commit 8bd7c7f
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 57 deletions.
diff --git a/kubernetes/overlays/prod/base/services/pyciemss-service/pyciemss-api-deployment.yaml b/kubernetes/overlays/prod/base/services/pyciemss-service/pyciemss-api-deployment.yaml
@@ -27,16 +27,23 @@ spec:
               value: 'False'
             - name: PYCIEMSS_OUTPUT_FILEPATH
               value: result.csv
+            - name: RABBITMQ_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: host
+            - name: RABBITMQ_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: port
             - name: RABBITMQ_USERNAME
               valueFrom:
                 secretKeyRef:
                   name: mq-creds
-                  key:
-                    username
+                  key: username
             - name: RABBITMQ_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: mq-creds
                   key: password
-            - name: RABBITMQ_SSL
-              value: 'True'
diff --git a/kubernetes/overlays/prod/base/services/pyciemss-service/pyciemss-worker-deployment.yaml b/kubernetes/overlays/prod/base/services/pyciemss-service/pyciemss-worker-deployment.yaml
@@ -28,16 +28,23 @@ spec:
               value: 'False'
             - name: PYCIEMSS_OUTPUT_FILEPATH
               value: result.csv
+            - name: RABBITMQ_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: host
+            - name: RABBITMQ_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: port
             - name: RABBITMQ_USERNAME
               valueFrom:
                 secretKeyRef:
                   name: mq-creds
-                  key:
-                    username
+                  key: username
             - name: RABBITMQ_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: mq-creds
                   key: password
-            - name: RABBITMQ_SSL
-              value: 'True'
diff --git a/kubernetes/overlays/prod/base/services/sciml-service/sciml-service-deployment.yaml b/kubernetes/overlays/prod/base/services/sciml-service/sciml-service-deployment.yaml
@@ -25,6 +25,16 @@ spec:
                   key: service_password
             - name: SIMSERVICE_RABBITMQ_ENABLED
               value: 'true'
+            - name: SIMSERVICE_RABBITMQ_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: host
+            - name: SIMSERVICE_RABBITMQ_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: mq-creds
+                  key: port
             - name: SIMSERVICE_RABBITMQ_LOGIN
               valueFrom:
                 secretKeyRef:

diff --git a/kubernetes/overlays/prod/overlays/askem-production/secrets/secrets-mq-creds.enc.yaml b/kubernetes/overlays/prod/overlays/askem-production/secrets/secrets-mq-creds.enc.yaml
@@ -1,14 +1,15 @@
----
 apiVersion: v1
 kind: Secret
 metadata:
     name: mq-creds
 type: Opaque
 data:
-    username: ENC[AES256_GCM,data:Ux/E2pjQplaZOeOr,iv:kQsem4vt1kzNhK8dt95EC9uRDjxnZfvrsVWg90UW9NA=,tag:NaisgkCBmrYzCiphf4D6lA==,type:str]
-    password: ENC[AES256_GCM,data:NE+CtAeZQU0JlNWn61c1oZaLp2af/sGwwRlPBGBfB7yH17/AljLFF6sGFlmbQ13w,iv:Wi57XWVk8Qn03drI0ispQS32AoGo68C63ro/Hs9eLpA=,tag:8oILs/PxxbdSbVgdpZ7ZDw==,type:str]
-    address: ENC[AES256_GCM,data:uceWMmksKsoRuMSOtR6Hj2a8mK6/fuz2RbZ9x3DABtGg/x+vpscZa2/dv642h+R9Jn//kIAS3bZWzPdk4L1Ox20+RW2e000fNrxVHdHzI9afxMXAkb4+1ucNip7jq/f+2O8ZAWXr4e4=,iv:6DE1bitC/y5/mfu9+omMlI8Ha0OHpY57TrqSNBC4TU8=,tag:bv6rnpPpwBfPL9AV6acdkQ==,type:str]
-    url: ENC[AES256_GCM,data:QOr+8rIK6SiXZMKGJk+nZESBO6mzEfNwOLNgiFF9bMNke/ZxAHJzlhaVYTF4cUslRE3J+qgj0fbvax+xEabet+cngS0hprKW7+9UeE8iQuWTopDtoRheEh9SYTVkfEuZ0n8UGQ==,iv:MJRERV9UgAk94v9e+dxZHPXNv6uOZJK1W+bFvXP6ju8=,tag:rxZADUL5qbepu+FTA9sbUg==,type:str]
+    username: ENC[AES256_GCM,data:Nz9JnQEsP6w1C39/,iv:1antdu3yBoKw3UrJcv7mn8VIb+qUN185upP3B/bWalU=,tag:XX7G6vW7Q1LGhu8h9zi5ng==,type:str]
+    password: ENC[AES256_GCM,data:OqdIzHQcatRiA2isSq95/mQuM8uFOXnne94B1VlFoBk3TWdlfyu1IXdgksHTmOUb,iv:HlYjQzrNibJEvJLm/OwOaaMiF3K0OPbVF7xoVqylD0A=,tag:1W6FbwdtGBF3e9Xm1lsrmQ==,type:str]
+    host: ENC[AES256_GCM,data:LfF9YzT+wpyz868UhgbUrTai1uYocBPaEDBbyiw1igZAWuakGJWXC/fSrVl0oN8+heyxS5hVx2DUucuqb7EfmdquYkVCP/CaiDtLxwMCf2VpGif6+45aEg==,iv:DKS8EE7F8aaKJ0ztpFBGlbdwkMQDDymRyOcZyXLnXB0=,tag:tYpmw0jFj7d4vxojuKRP2w==,type:str]
+    port: ENC[AES256_GCM,data:ctj3jZg0BbE=,iv:H5neniwFjBR7uKYKgj7OLhdwZieIiV0ST9/li9Stzls=,tag:MCOmzh8HVdEvxRmxExpyvg==,type:str]
+    address: ENC[AES256_GCM,data:a6NUYzfyNmjn7IPUgxNJC7tDmpuc54FKRDiBuFHrm+kSGhFQEhH9CtrTBVjrkyqXHZjWxSvOXDTapXM6YqtaknCv82rgOWtaMOHiaYI2poskSnDQ7ik2PxO0pbly6pScNSGwRipM1aE=,iv:5M8zRc+be9X6Lsw3Dj2vPezfN+1k+Gy3/wPdzA1gYqQ=,tag:2ww/dfjaaxQC1jU5soE4Og==,type:str]
+    url: ENC[AES256_GCM,data:WxaUa5PIMyqhYUfsOHk/8vKL/EWrn4lz+LMGvRGEWxroyPRsxsCm5keB12j4Xu0eONLqod6NxplYTAf8yzIgFU/NtLKhe2PYLsJzYlMb/ewKZg7gIXS6m0AOmJ4LGXNwAWDHkg==,iv:kTdiM9ViHMai67zngiwsgkjaLngGQ0RTQ5oUCV0lb5E=,tag:Kn9NeMjqA0iRsDuoArLCxw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -18,14 +19,14 @@ sops:
         - recipient: age1q5q7lt6twttye7h5dx4zu0eek04pu6szqfx28w00vq3z6nmlc9dq7md4xd
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpd25BK0ptakljYVhFNUJ3
-            cVFzbUNMbmY5M2duc0VmRHhLdTBqcTN5SG04CkdUZVhGU0llbWdOK2phNDV3c2RW
-            K2hobEY2aFNXMUh3U2liak90cG93bHcKLS0tIEdiNit3N3hLemRiSmgrWkl4WFFO
-            UmswOWwvckhYdldBQUFLK2M4am5hNTAKmdkZm+UEulABYh2HAtMLg1cPIOD3iOVJ
-            YzBCYhqwpdquTk4c3Jj9/fO3X4C1QAoydc9aNwkRJF9CTFjbrdlxkA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0K25zK2RIOC9XM25HVDVI
+            K1QwWFVNM1pZUFhMeWlKVUg5eFRMQ0xXUXhBCmJQTUFYYyswOWErVjRFUFI4dWx1
+            SlB5THhEeXBhTUJoSE9WeVdpSnpIQWMKLS0tIFZrYzZLdDI4TmlGdy9kWXllS1F4
+            d1Z1dkJTWjYzTUE0K2hiTTcvbmxlVjAKqeUKFPbC4cPoAhHYQjh+QM8/LHYvVAcM
+            vfn9qBsvZmR7V/2cegaVfoSWQta7DuHWPx47ghoU/KYLpN32yDYzlQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-21T14:39:19Z"
-    mac: ENC[AES256_GCM,data:UlR8G+zmay6430ijtxrnYHTkZdTRNfxuT+5Y/UF4fpSngXKUMTWPsbnK8JLJdcSJqudNm2gUBs1Ui7/P24A85CzTirUsZlM5kziI3t7PIJOsTcmmOuBpRGULWP44P41a7U/9fdkgMVOji0uPNz5AJULEvC4AaTfLsICFEipVUNw=,iv:elbT/Ear4yI/7DLrlBg3it613iTWMvpJV4NMJ1Doww4=,tag:RaHtfHuCJLHJvdnD3KsZWA==,type:str]
+    lastmodified: "2024-05-07T17:41:33Z"
+    mac: ENC[AES256_GCM,data:9rWiU9nekR162OUZJnwUxHoaExt9DaNRdcVM/pSb5K0z4sR5HfGJTrebxaQZYmgFpu9lEyUUI2ayrtpRCr0kDJoOrq9ucMY2seUWGNdnwYX6htDR4ntszKSUnkOGtcAQXQrKVVbPEv8QoXE7lvkuF5hwTJBxCbungeZNjLyIpt0=,iv:iR6qY3Qk3jHiCeqsTjg4idiyZEkbCY7emHn4jH57zhU=,tag:KkNAx4M8DbqetcLOpWuasA==,type:str]
     pgp: []
     encrypted_regex: ^(data|stringData)$
     version: 3.8.1
diff --git a/...ays/prod/overlays/askem-production/services/pyciemss-service/pyciemss-api-deployment.yaml b/...ays/prod/overlays/askem-production/services/pyciemss-service/pyciemss-api-deployment.yaml
@@ -13,7 +13,5 @@ spec:
               value: redis.terarium.ai
             - name: REDIS_PORT
               value: '6379'
-            - name: RABBITMQ_HOST
-              value: 'b-68052fee-712b-461b-81c3-7a82a8112d50.mq.us-east-1.amazonaws.com'
-            - name: RABBITMQ_PORT
-              value: '5671'
+            - name: RABBITMQ_SSL
+              value: 'True'
diff --git a/.../prod/overlays/askem-production/services/pyciemss-service/pyciemss-worker-deployment.yaml b/.../prod/overlays/askem-production/services/pyciemss-service/pyciemss-worker-deployment.yaml
@@ -13,7 +13,5 @@ spec:
               value: redis.terarium.ai
             - name: REDIS_PORT
               value: '6379'
-            - name: RABBITMQ_HOST
-              value: 'b-68052fee-712b-461b-81c3-7a82a8112d50.mq.us-east-1.amazonaws.com'
-            - name: RABBITMQ_PORT
-              value: '5671'
+            - name: RABBITMQ_SSL
+              value: 'True'
diff --git a/...rlays/prod/overlays/askem-production/services/sciml-service/sciml-service-deployment.yaml b/...rlays/prod/overlays/askem-production/services/sciml-service/sciml-service-deployment.yaml
@@ -11,9 +11,5 @@ spec:
       containers:
         - name: sciml-service
           env:
-            - name: SIMSERVICE_RABBITMQ_HOST
-              value: 'b-68052fee-712b-461b-81c3-7a82a8112d50.mq.us-east-1.amazonaws.com'
-            - name: SIMSERVICE_RABBITMQ_PORT
-              value: '5671'
             - name: SIMSERVICE_RABBITMQ_SSL
               value: 'true'
diff --git a/kubernetes/overlays/prod/overlays/askem-staging/secrets/secrets-mq-creds.enc.yaml b/kubernetes/overlays/prod/overlays/askem-staging/secrets/secrets-mq-creds.enc.yaml
@@ -1,14 +1,15 @@
----
 apiVersion: v1
 kind: Secret
 metadata:
     name: mq-creds
 type: Opaque
 data:
-    username: ENC[AES256_GCM,data:mI9dJYmgEa/XM1L1,iv:H4qh0ytz7E3SvVjj6DE4HpNrr8oqZdDawJx0WhKfWMc=,tag:AAnReUMjU0W4xLDBVroEKQ==,type:str]
-    password: ENC[AES256_GCM,data:mNt6wm//oEPKXzlL1ZXbQ5gpAL2GN0LJUbfKUoxeWf+3BN6lBiVeYkwPuIIZPzL1,iv:wk1Mu/j1cgW1QgOHgW97O6vvCgG7HAYvXPG8l0cwo1E=,tag:e1eL9v/4OKOhWKrcQyi1WQ==,type:str]
-    address: ENC[AES256_GCM,data:waCiL7zU2TcICiBpF3i8j1I6uKlWjWd1Xy8i4iB64ZQUnMvQ2hgYhcp7vyUapTvAC57f8+gD5zYUQbf+giCF8DEIh3yaE3XgworzyOwehwcim9xADcBLcE62d4dVcptLP6QwFoDowk8=,iv:R6/pw40vVk5CcxWh82wmWEVphDfb9Sp1m/kHNZ6EQ38=,tag:Iz4cKmVB4Cl2iNP0LM5afA==,type:str]
-    url: ENC[AES256_GCM,data:INEgiBcJXi09JxxSfHNJUFBouRWN3jd9eoSIFrX4lQCNEDedTgCcs7AepQRH/1HR33WcuKK+hFf5eouDQzIBGiBfKuCD3SXYkLBO2mvpVFbSotZMl4J1NMyl9QgyszxB/h+Thw==,iv:5ulgInf7cV+lc1/5l1Yzmbqgp3ElktAig2MJJH1a/gU=,tag:t71iQv0zKstqGDHdlqwoIQ==,type:str]
+    username: ENC[AES256_GCM,data:UV7pT8AtQ3w=,iv:ukSHgxkHvsIZt5jR1Nlov9AZhoeUndgvb279lyalkKE=,tag:CBtTEl5zV2TMhiBRSNXwNg==,type:str]
+    password: ENC[AES256_GCM,data:zSWItN2I5pQ=,iv:xJxZUUtMM/gDt7we0kUr5u51FiPwWVwnUCZwGbTMaLU=,tag:98ITqDPLTHFDe+nqp94kag==,type:str]
+    host: ENC[AES256_GCM,data:0FyeD4NxrFBtuEpJIeb1yA==,iv:y/PZHzeIxGnwDfzPusW/dWirbHp02hV86EceQfK2YcA=,tag:a+B1Vjl0rnCJY8SXP0iuVw==,type:str]
+    port: ENC[AES256_GCM,data:EJrDPVJ3WJ0=,iv:2fj+lIe4rgFV7XLhDYEMxAudXag7WxYxWCkA/dUOhpA=,tag:yyRUhMa6aadvJaljJI3GTQ==,type:str]
+    address: ENC[AES256_GCM,data:i20BqHx3cluEk1DYfHkXutMMTpcUIfGHtZdM8r/gT4s=,iv:49BlDrYe8JdO1F+Gaz69CGDFaeYenKbzdLPG2fh1cQc=,tag:m/iWk29EeUVgVBMKVTh0tA==,type:str]
+    url: ENC[AES256_GCM,data:eS7KKoCyvi9qO97ZPNtQk7+kec0vedQz91v17tH+pJtUGa2V,iv:A+xrgwZCuaK/0ov7djvyy6ONJWgxMq911PD4rCxG9pY=,tag:p6Wqdn3Kwsj5b3rYWLThfA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -18,14 +19,14 @@ sops:
         - recipient: age1q5q7lt6twttye7h5dx4zu0eek04pu6szqfx28w00vq3z6nmlc9dq7md4xd
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3L2xpQjNWeFFHQUxHd0ZN
-            YlFRakt6dDdrMjFzLzAyOXRVUFdIOXNlZkIwCmlIU3dtUGxvell6NUtYb0ZTbnU3
-            UStHamxkL2RXSm8xQTI4TXBydGxTREkKLS0tIDdpSlBpZE5ScDJxOHpxSm9vYlF2
-            SklpYzhHOEJSaENTYUxpOEc0eCtIMnMKpJxoOTbxidFP0mw/zsWXd0/JEYvW8OMl
-            qoo+L/XEL4gi24uuEXu5fwvTDsHkE2jE6fjkL6KCevpoPl+DA8s63w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4L09RdG5rRjk5Z3NkWmpj
+            bXRFTG1ZS3FhdSt2TUJNQWtjRWs1dWxudTBFCmUwY01ZQTZRei8vWUp3LytrSEU5
+            N2pENE9mcytSZmYvM1Roekt5bU1xMGMKLS0tIEtzMDljK2ZwWlQ5cHpia0RWRVpK
+            K2ZySlhoaGtQMjdzMEFsRnRqL3NJa1kKyWwGBjqNjeREnQpIz3tu6ZMWBiUyrsAa
+            D14OesC3nTeTkWzwfRHySptWZMvXaKLyYBRgs9vQ8GDFxXIqTe/udw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-21T14:31:30Z"
-    mac: ENC[AES256_GCM,data:hUMUIz5h+EMP6aQb6D6Rq1aIvzlS4gOwoXUyStWv1Xh499Rd3M0DmOBMAQipc/2T5FA5exZj5OJNWx23q0w0HDNTAm1J5u/rCckQvi/x8gTQmm7vyQhhiD63rGQbYl6V8jrTvONIQ+IE1x/rdcxI4lGZ9xnE6d8jgpYze3vghgU=,iv:K+J6wgA8zOiZlndp3/xozRA7bmSFi6l4IpiFhAHGpfQ=,tag:HM0wNRDHKPWHX52aRy1EdA==,type:str]
+    lastmodified: "2024-05-07T17:41:41Z"
+    mac: ENC[AES256_GCM,data:7MwFoZ1Bluw9Hp9Ic6ixTqjlOLFsKD9ZLpQp6zQQ+NWD2+SavvV4lwVN2KHmzuB39fRy9doHAj28XeqCcd3QnZ69uAofbqCvmVMBlrM2ybGkF1jX8QdJYhQRw8nXVidkaeUA3y1yCEWAmpMpagU7tEiXHg5lUaq2RFPAluGzVzU=,iv:q2VT7Sokkrml5DuXoGFWI3S5y/ue3fd+qCqnorYHpMQ=,tag:leIJ1AQuiMmipGPZg0Oqgg==,type:str]
     pgp: []
     encrypted_regex: ^(data|stringData)$
     version: 3.8.1
diff --git a/...erlays/prod/overlays/askem-staging/services/pyciemss-service/pyciemss-api-deployment.yaml b/...erlays/prod/overlays/askem-staging/services/pyciemss-service/pyciemss-api-deployment.yaml
@@ -13,7 +13,5 @@ spec:
               value: redis.staging.terarium.ai
             - name: REDIS_PORT
               value: '6379'
-            - name: RABBITMQ_HOST
-              value: 'b-1cb71505-9454-4d81-8ca0-a0ee6faf5770.mq.us-east-1.amazonaws.com'
-            - name: RABBITMQ_PORT
-              value: '5671'
+            - name: RABBITMQ_SSL
+              value: 'False'
diff --git a/...ays/prod/overlays/askem-staging/services/pyciemss-service/pyciemss-worker-deployment.yaml b/...ays/prod/overlays/askem-staging/services/pyciemss-service/pyciemss-worker-deployment.yaml
@@ -13,7 +13,5 @@ spec:
               value: redis.staging.terarium.ai
             - name: REDIS_PORT
               value: '6379'
-            - name: RABBITMQ_HOST
-              value: 'b-1cb71505-9454-4d81-8ca0-a0ee6faf5770.mq.us-east-1.amazonaws.com'
-            - name: RABBITMQ_PORT
-              value: '5671'
+            - name: RABBITMQ_SSL
+              value: 'False'
diff --git a/...overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-deployment.yaml b/...overlays/prod/overlays/askem-staging/services/sciml-service/sciml-service-deployment.yaml
@@ -11,9 +11,5 @@ spec:
       containers:
         - name: sciml-service
           env:
-            - name: SIMSERVICE_RABBITMQ_HOST
-              value: 'b-1cb71505-9454-4d81-8ca0-a0ee6faf5770.mq.us-east-1.amazonaws.com'
-            - name: SIMSERVICE_RABBITMQ_PORT
-              value: '5671'
             - name: SIMSERVICE_RABBITMQ_SSL
-              value: 'true'
+              value: 'false'