Fix: cert to pem file

Leo310 · Nov 5, 2022 · 4c563d6 · 4c563d6
1 parent 0ea80fe
commit 4c563d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/applications/cloudflared/deployment.yaml b/applications/cloudflared/deployment.yaml
@@ -32,12 +32,6 @@ spec:
           failureThreshold: 1
           initialDelaySeconds: 10
           periodSeconds: 10
-        env:
-        - name: TUNNEL_ORIGIN_CERT
-          valueFrom:
-            secretKeyRef:
-              name: tunnel-credentials
-              key: origincert
         volumeMounts:
         - name: config
           mountPath: /etc/cloudflared/config
@@ -55,6 +49,7 @@ spec:
           items:
           - key: credentials.json
             path: cert
+          - key: cert.pem
       # Create a config.yaml file from the ConfigMap below.
       - name: config
         configMap:

diff --git a/tooling/create_environment.sh b/tooling/create_environment.sh
@@ -61,7 +61,7 @@ function main() {
 	# create_secret "cloudflare-ca-key" ${TOP_LEVEL_DIR}/applications/cloudflared/cloudflared/cloudflare-ca-secret.yaml CF_CA_API_KEY key
 
 	create_secret tunnel-credentials ${TOP_LEVEL_DIR}/applications/cloudflared/tunnel-credentials.yaml\
-		CF_TUNNEL_CREDS credentials.json CF_TUNNEL_ORIGIN_CERT origincert
+		CF_TUNNEL_CREDS credentials.json CF_TUNNEL_ORIGIN_CERT cert.pem
 
 	create_secret mysql ${TOP_LEVEL_DIR}/applications/webapp/matomo/mysql-secret.yaml MYSQL_SECRET password
 

diff --git a/tooling/secret-templates/tunnel-credentials-secret.yaml b/tooling/secret-templates/tunnel-credentials-secret.yaml
@@ -7,4 +7,4 @@ metadata:
     argocd.argoproj.io/secret-type: repository
 stringData:
   credentials.json: CF_TUNNEL_CREDS
-  origincert: CF_TUNNEL_ORIGIN_CERT
+  cert.pem: CF_TUNNEL_ORIGIN_CERT