(HP-1645): get credentials from single secret

doc/kube-setup-zendesk-wrapper.md

@@ -2,4 +2,5 @@
 
 Setup Zendesk wrapper service and deployment
 
-Need to supply a `zendesk_api_key.txt` and a `zendesk_email.txt` file under `$(gen3_secrets_folder)/g3auto/zendesk/`
+Need to supply a `zendesk_client_credentials.json` file under `$(gen3_secrets_folder)/g3auto/zendesk/`,
+with keys `zendesk_email` and `api_key`.

gen3/bin/kube-setup-zendesk-wrapper.sh

@@ -8,13 +8,8 @@ if ! g3kubectl get secrets/zendesk-g3auto > /dev/null 2>&1; then
     exit 1
 fi
 
-if ! gen3 secrets decode zendesk-g3auto zendesk_api_key.txt> /dev/null 2>&1; then
-    gen3_log_err "No zendesk api key present in zendesk-g3auto secret, not rolling zendesk wrapper"
-    exit 1
-fi
-
-if ! gen3 secrets decode zendesk-g3auto zendesk_email.txt> /dev/null 2>&1; then
-    gen3_log_err "No zendesk email present in zendesk-g3auto secret, not rolling zendesk wrapper"
+if ! gen3 secrets decode zendesk-g3auto zendesk_client_credentials.json> /dev/null 2>&1; then
+    gen3_log_err "No zendesk client credentials present in zendesk-g3auto secret, not rolling zendesk wrapper"
     exit 1
 fi
 

kube/services/zendesk-wrapper/zendesk-wrapper-deploy.yaml

@@ -93,16 +93,11 @@ spec:
         env:
           - name: HOSTNAME
             value: revproxy-service
-          - name: API_KEY
+          - name: ZENDESK_CLIENT_CREDENTIALS
             valueFrom:
               secretKeyRef:
                 name: zendesk-g3auto
-                key: "zendesk_api_key.txt"
-          - name: ZENDESK_EMAIL
-            valueFrom:
-              secretKeyRef:
-                name: zendesk-g3auto
-                key: "zendesk_email.txt"
+                key: "zendesk_client_credentials.json"
         volumeMounts:
           - name: "ca-volume"
             readOnly: true