From e22c22a58a50c1f5e44e61fb44e641ade5a09e2a Mon Sep 17 00:00:00 2001
From: Victor Roest <victor@xirion.net>
Date: Fri, 29 Oct 2021 21:30:31 +0200
Subject: [PATCH] external-secrets: change back to approle and remove prefix

---
 .../zookeeper/external-secret.yaml            |  8 ++---
 .../external-secrets/vault-secret-store.yaml  | 30 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml b/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml
index d880c6f..e506c03 100644
--- a/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml
+++ b/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml
@@ -13,17 +13,17 @@ spec:
   data:
   - secretKey: DISCORD_APP_ID
     remoteRef:
-      key: k8s/presidential-paradise/zookeeper
+      key: presidential-paradise/zookeeper
       property: discord_app_id
   - secretKey: DISCORD_PUBLIC_KEY
     remoteRef:
-      key: k8s/presidential-paradise/zookeeper
+      key: presidential-paradise/zookeeper
       property: discord_public_key
   - secretKey: DISCORD_TOKEN
     remoteRef:
-      key: k8s/presidential-paradise/zookeeper
+      key: presidential-paradise/zookeeper
       property: discord_token
   - secretKey: TWITTER_TOKEN
     remoteRef:
-      key: k8s/presidential-paradise/zookeeper
+      key: presidential-paradise/zookeeper
       property: twitter_token
diff --git a/cluster/core/external-secrets/external-secrets/vault-secret-store.yaml b/cluster/core/external-secrets/external-secrets/vault-secret-store.yaml
index 916d7e2..e10a256 100644
--- a/cluster/core/external-secrets/external-secrets/vault-secret-store.yaml
+++ b/cluster/core/external-secrets/external-secrets/vault-secret-store.yaml
@@ -13,18 +13,18 @@ spec:
         # VaultAppRole authenticates with Vault using the
         # App Role auth mechanism
         # https://www.vaultproject.io/docs/auth/approle
-        tokenSecretRef:
-          name: "vault-secret-id"
-          namespace: "external-secrets"
-          key: "token"
-        # appRole:
-        #   # Path where the App Role authentication backend is mounted
-        #   path: "approle"
-        #   # RoleID configured in the App Role authentication backend
-        #   roleId: "bb841a0e-45c1-9dab-36f0-f72647d6aff0"
-        #   # Reference to a key in a K8 Secret that contains the App Role SecretId
-        #   # (not commited in git)
-        #   secretRef:
-        #     name: "vault-secret-id"
-        #     namespace: "external-secrets"
-        #     key: "secret-id"
+        # tokenSecretRef:
+        #   name: "vault-secret-id"
+        #   namespace: "external-secrets"
+        #   key: "token"
+        appRole:
+          # Path where the App Role authentication backend is mounted
+          path: "approle"
+          # RoleID configured in the App Role authentication backend
+          roleId: "bb841a0e-45c1-9dab-36f0-f72647d6aff0"
+          # Reference to a key in a K8 Secret that contains the App Role SecretId
+          # (not commited in git)
+          secretRef:
+            name: "vault-secret-id"
+            namespace: "external-secrets"
+            key: "secret-id"