Closed github-actions[bot] closed 4 years ago
There's a problem here with the k8s changes. Let's hold up this merge for a minute.
Investigated the issue (resulting in #590) and resolved the conflict. Merge should be ok to proceed.
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:
Actions to deploy v1.1.4: