Merge pull request #70 from projectsyn/fix/auth_path_config

Fix `mount_path` key location
projectsyn · Mar 18, 2022 · 94d51c7 · 94d51c7
2 parents 37fc2ed + 070d43b
commit 94d51c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/component/repo-server.jsonnet b/component/repo-server.jsonnet
@@ -12,11 +12,11 @@ local vault_agent_config = kube.ConfigMap('vault-agent-config') {
   data: {
     'vault-agent-config.json': std.manifestJson({
       exit_after_auth: false,
-      [if std.objectHas(inv.parameters.secret_management, 'vault_auth_mount_path') then 'mount_path']: inv.parameters.secret_management.vault_auth_mount_path,
       auto_auth: {
         method: [
           {
             type: 'kubernetes',
+            [if std.objectHas(inv.parameters.secret_management, 'vault_auth_mount_path') then 'mount_path']: inv.parameters.secret_management.vault_auth_mount_path,
             config: {
               role: inv.parameters.secret_management.vault_role,
               token_path: '/var/run/secrets/syn/token',

diff --git a/tests/golden/defaults/argocd/argocd/30_repo-server/configmap.yaml b/tests/golden/defaults/argocd/argocd/30_repo-server/configmap.yaml
@@ -3,13 +3,13 @@ data:
   vault-agent-config.json: "{\n    \"auto_auth\": {\n        \"method\": [\n     \
     \       {\n                \"config\": {\n                    \"role\": \"test\"\
     ,\n                    \"token_path\": \"/var/run/secrets/syn/token\"\n      \
-    \          },\n                \"type\": \"kubernetes\"\n            }\n     \
-    \   ],\n        \"sinks\": [\n            {\n                \"sink\": {\n   \
-    \                 \"config\": {\n                        \"mode\": 420,\n    \
-    \                    \"path\": \"/home/vault/.vault-token\"\n                \
-    \    },\n                    \"type\": \"file\"\n                }\n         \
-    \   }\n        ]\n    },\n    \"exit_after_auth\": false,\n    \"mount_path\"\
-    : \"auth/lieutenant\"\n}"
+    \          },\n                \"mount_path\": \"auth/lieutenant\",\n        \
+    \        \"type\": \"kubernetes\"\n            }\n        ],\n        \"sinks\"\
+    : [\n            {\n                \"sink\": {\n                    \"config\"\
+    : {\n                        \"mode\": 420,\n                        \"path\"\
+    : \"/home/vault/.vault-token\"\n                    },\n                    \"\
+    type\": \"file\"\n                }\n            }\n        ]\n    },\n    \"\
+    exit_after_auth\": false\n}"
 kind: ConfigMap
 metadata:
   annotations: {}