CodeForPhilly / chime

COVID-19 Hospital Impact Model for Epidemics
https://codeforphilly.github.io/chime/
MIT License
205 stars 151 forks source link

Deploy CHIME 1.1.4 #589

Closed github-actions[bot] closed 4 years ago

github-actions[bot] commented 4 years ago

Actions to deploy v1.1.4:

diff -u -N /tmp/LIVE-898375748/apps.v1.Deployment.chime.chime /tmp/MERGED-940864723/apps.v1.Deployment.chime.chime
--- /tmp/LIVE-898375748/apps.v1.Deployment.chime.chime  2020-05-01 16:55:01.185483306 +0000
+++ /tmp/MERGED-940864723/apps.v1.Deployment.chime.chime    2020-05-01 16:55:01.241483516 +0000
@@ -8,12 +8,12 @@
     kubernetes.io/change-cause: kubectl set image deployment/chime chime=docker.pkg.github.com/lottspot/chime/penn-chime:e3ec67c54e5253814682cecbc7ab4c9bfb40a108
       --namespace=chime --record=true
   creationTimestamp: "2020-03-24T03:00:10Z"
-  generation: 98
+  generation: 99
   labels:
     app: chime
   name: chime
   namespace: chime
-  resourceVersion: "15548224"
+  resourceVersion: "15554487"
   selfLink: /apis/apps/v1/namespaces/chime/deployments/chime
   uid: bd3aa4ac-2778-4780-b02e-54d35b1851c0
 spec:
@@ -37,7 +37,7 @@
         app: chime
     spec:
       containers:
-      - image: docker.pkg.github.com/codeforphilly/chime/penn-chime:1.1.4-rc.10
+      - image: docker.pkg.github.com/codeforphilly/chime/penn-chime:1.1.4
         imagePullPolicy: IfNotPresent
         name: chime
         ports:
diff -u -N /tmp/LIVE-898375748/extensions.v1beta1.Ingress.chime.chime /tmp/MERGED-940864723/extensions.v1beta1.Ingress.chime.chime
--- /tmp/LIVE-898375748/extensions.v1beta1.Ingress.chime.chime  2020-05-01 16:55:01.681485164 +0000
+++ /tmp/MERGED-940864723/extensions.v1beta1.Ingress.chime.chime    2020-05-01 16:55:01.797485598 +0000
@@ -16,17 +16,17 @@
       sub_filter '</body>' '<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KBZ6ZKX" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript></body>';
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
   creationTimestamp: "2020-03-24T03:00:10Z"
-  generation: 18
+  generation: 19
   labels:
     app: chime
   name: chime
   namespace: chime
-  resourceVersion: "8741851"
+  resourceVersion: "15554522"
   selfLink: /apis/extensions/v1beta1/namespaces/chime/ingresses/chime
   uid: f6ea6e02-8437-487d-98b3-4a42edc26b69
 spec:
   rules:
-  - host: penn-chime.bus.phl.io
+  - host: penn-chime.phl.io
     http:
       paths:
       - backend:
@@ -35,7 +35,7 @@
         path: /
   tls:
   - hosts:
-    - penn-chime.bus.phl.io
+    - penn-chime.phl.io
     secretName: tls-secret
 status:
   loadBalancer:
diff -u -N /tmp/LIVE-898375748/extensions.v1beta1.Ingress.chime.chime-static /tmp/MERGED-940864723/extensions.v1beta1.Ingress.chime.chime-static
--- /tmp/LIVE-898375748/extensions.v1beta1.Ingress.chime.chime-static   2020-05-01 16:55:02.245487220 +0000
+++ /tmp/MERGED-940864723/extensions.v1beta1.Ingress.chime.chime-static 2020-05-01 16:55:02.289487375 +0000
@@ -15,17 +15,24 @@
       add_header X-Cache-Status $upstream_cache_status;
     nginx.ingress.kubernetes.io/proxy-buffering: "on"
   creationTimestamp: "2020-03-24T03:00:10Z"
-  generation: 20
+  generation: 21
   labels:
     app: chime
   name: chime-static
   namespace: chime
-  resourceVersion: "8741858"
+  resourceVersion: "15554542"
   selfLink: /apis/extensions/v1beta1/namespaces/chime/ingresses/chime-static
   uid: 31f8fcbf-f24a-4cc4-8d19-daf118aab17f
 spec:
   rules:
-  - host: penn-chime.bus.phl.io
+  - host: penn-chime.phl.io
+    http:
+      paths:
+      - backend:
+          serviceName: chime
+          servicePort: 80
+        path: /static/
+  - host: lke.penn-chime.phl.io
     http:
       paths:
       - backend:
lottspot commented 4 years ago

There's a problem here with the k8s changes. Let's hold up this merge for a minute.

lottspot commented 4 years ago

Investigated the issue (resulting in #590) and resolved the conflict. Merge should be ok to proceed.

lottspot commented 4 years ago

The correct diff is included below:

diff -u -N /tmp/LIVE-339364726/apps.v1.Deployment.chime.chime /tmp/MERGED-064746077/apps.v1.Deployment.chime.chime
--- /tmp/LIVE-339364726/apps.v1.Deployment.chime.chime  2020-05-01 13:01:57.300745187 -0400
+++ /tmp/MERGED-064746077/apps.v1.Deployment.chime.chime    2020-05-01 13:01:57.387411852 -0400
@@ -9,12 +9,12 @@
     kubernetes.io/change-cause: kubectl set image deployment/chime chime=docker.pkg.github.com/codeforphilly/chime/penn-chime:1.0.0
       --namespace=chime --record=true
   creationTimestamp: "2020-03-17T22:40:47Z"
-  generation: 24
+  generation: 25
   labels:
     app: chime
   name: chime
   namespace: chime
-  resourceVersion: "15076535"
+  resourceVersion: "18630774"
   selfLink: /apis/apps/v1/namespaces/chime/deployments/chime
   uid: 0ee5c93a-5e1b-43ab-a510-60d8c4127995
 spec:
@@ -36,48 +36,7 @@
         app: chime
     spec:
       containers:
-      - env:
-        - name: GAPI_CRED_TYPE
-          valueFrom:
-            secretKeyRef:
-              key: type
-              name: google-api-creds
-        - name: GAPI_CRED_PROJECT_ID
-          valueFrom:
-            secretKeyRef:
-              key: project_id
-              name: google-api-creds
-        - name: GAPI_CRED_PRIVATE_KEY_ID
-          valueFrom:
-            secretKeyRef:
-              key: private_key_id
-              name: google-api-creds
-        - name: GAPI_CRED_PRIVATE_KEY
-          valueFrom:
-            secretKeyRef:
-              key: private_key
-              name: google-api-creds
-        - name: GAPI_CRED_CLIENT_EMAIL
-          valueFrom:
-            secretKeyRef:
-              key: client_email
-              name: google-api-creds
-        - name: GAPI_CRED_CLIENT_ID
-          valueFrom:
-            secretKeyRef:
-              key: client_id
-              name: google-api-creds
-        - name: GAPI_CRED_AUTH_PROVIDER_X509_CERT_URL
-          valueFrom:
-            secretKeyRef:
-              key: auth_provider_x509_cert_url
-              name: google-api-creds
-        - name: GAPI_CRED_CLIENT_X509_CERT_URL
-          valueFrom:
-            secretKeyRef:
-              key: client_x509_cert_url
-              name: google-api-creds
-        image: docker.pkg.github.com/codeforphilly/chime/penn-chime:1.1.3
+      - image: docker.pkg.github.com/codeforphilly/chime/penn-chime:1.1.4
         imagePullPolicy: Always
         name: chime
         ports:
@@ -87,6 +46,10 @@
         resources: {}
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /mnt/google-api-creds
+          name: google-api-creds
+          readOnly: true
       dnsPolicy: ClusterFirst
       imagePullSecrets:
       - name: regcred
@@ -94,6 +57,11 @@
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
+      volumes:
+      - name: google-api-creds
+        secret:
+          defaultMode: 420
+          secretName: google-api-creds-json
 status:
   availableReplicas: 15
   conditions: