Remove Vault dependency for deployments

services/DroneCI/deploy-DroneCI.yml

@@ -23,16 +23,6 @@ spec:
       app: drone
   template:
     metadata:
-      annotations:
-        vault.hashicorp.com/agent-inject: "true"
-        vault.hashicorp.com/agent-inject-secret-drone: "secret/drone"
-        vault.hashicorp.com/role: "drone"
-        vault.hashicorp.com/agent-inject-template-drone: |
-          {{ with secret "secret/drone" -}}
-            export DRONE_RPC_SECRET="{{ .Data.data.rpcsecret }}"
-            export DRONE_GITEA_CLIENT_ID="{{ .Data.data.giteaclientid }}"
-            export DRONE_GITEA_CLIENT_SECRET="{{ .Data.data.giteaclientsecret }}"
-          {{- end }}
       labels:
         app: drone
     spec:
@@ -40,7 +30,6 @@ spec:
       containers:
       - name: drone
         image: drone/drone:latest
-        command: ["sh", "-c", ". /vault/secrets/drone && /bin/drone-server"]
         env:
         - name: DRONE_SERVER_PROTO
           value: 'https'
@@ -52,8 +41,6 @@ spec:
           value: 'false'
         - name: DRONE_GITEA_SERVER
           value: 'https://code.spamasaurus.com'
-#        - name: DRONE_LOGS_DEBUG
-#          value: 'true'
         - name: DRONE_GIT_ALWAYS_AUTH
           value: 'false'
         - name: DRONE_AGENTS_ENABLED
@@ -62,6 +49,9 @@ spec:
           value: 'username:djpbessems,admin:true'
         - name: DRONE_TMATE_ENABLED
           value: 'false'
+        envFrom:
+        - secretRef:
+            name: drone-secret
         ports:
           - name: ui
             containerPort: 80
@@ -70,7 +60,6 @@ spec:
           name: flexvolsmb-drone-data
       - name: drone-runner
         image: drone/drone-runner-kube:latest
-        command: ["sh", "-c", ". /vault/secrets/drone && /bin/drone-runner-kube"]
         ports:
         - containerPort: 3000
         env:
@@ -82,6 +71,9 @@ spec:
           value: '2'
         - name: DRONE_RUNNER_MAX_PROCS
           value: '3'
+        envFrom:
+        - secretRef:
+            name: drone-secret
       volumes:
       - name: flexvolsmb-drone-data
         persistentVolumeClaim:

services/DroneCI/secret-DroneCI.yml.template

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: drone-secret
+  labels:
+    app: drone
+stringData:
+  DRONE_RPC_SECRET: '<removed>'
+  DRONE_GITEA_CLIENT_ID: '<removed>'
+  DRONE_GITEA_CLIENT_SECRET: '<removed>'