Merge pull request #30 from projectsyn/feat/external-vault

Add option to configure auth path when connecting to external an vault
projectsyn · Mar 16, 2022 · 694be36 · 694be36
2 parents 1c3e5f6 + d9bcd5f
commit 694be36
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -5,7 +5,7 @@ parameters:
       operator:
         registry: quay.io
         repository: projectsyn/lieutenant-operator
-        version: '1.1.2'
+        version: '1.3.0'
       api:
         registry: docker.io
         repository: projectsyn/lieutenant-api
@@ -26,6 +26,7 @@ parameters:
       vault:
         enabled: true
         addr: vault.todo
+        auth_path: 'kubernetes'
         path: kv
     api:
       lieutenant_instance: ${lieutenant:namespace}

diff --git a/component/operator.jsonnet b/component/operator.jsonnet
@@ -72,6 +72,10 @@ local objects = [
                         name: 'VAULT_ADDR',
                         value: params.operator.vault.addr,
                       },
+                      {
+                        name: 'VAULT_AUTH_PATH',
+                        value: params.operator.vault.auth_path,
+                      }
                       {
                         name: 'VAULT_SECRET_ENGINE_PATH',
                         value: params.operator.vault.path,

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -78,6 +78,13 @@ default:: `vault.todo`
 
 Address to the Vault instance.
 
+== `operator.vault.auth_path`
+
+[horizontal]
+type:: string
+default:: `kubernetes`
+
+The mount path of the Vault authentication method to use.
 
 == `operator.vault.path`
 

diff --git a/tests/golden/defaults/lieutenant/lieutenant/00_crds/syn.tools_tenants.yaml b/tests/golden/defaults/lieutenant/lieutenant/00_crds/syn.tools_tenants.yaml
@@ -45,8 +45,8 @@ spec:
             properties:
               clusterTemplate:
                 description: ClusterTemplate defines a template which will be used
-                  to set defaults for the clusters of this tenant. The fields whitin
-                  this can use Go templating. See [the docs](https://syn.tools/lieutenant-operator/explanation/templating.html)
+                  to set defaults for the clusters of this tenant. The fields within
+                  this can use Go templating. See https://syn.tools/lieutenant-operator/explanations/templating.html
                   for details.
                 properties:
                   deletionPolicy:

diff --git a/tests/golden/defaults/lieutenant/lieutenant/00_crds/syn.tools_tenanttemplates.yaml b/tests/golden/defaults/lieutenant/lieutenant/00_crds/syn.tools_tenanttemplates.yaml
@@ -45,8 +45,8 @@ spec:
             properties:
               clusterTemplate:
                 description: ClusterTemplate defines a template which will be used
-                  to set defaults for the clusters of this tenant. The fields whitin
-                  this can use Go templating. See [the docs](https://syn.tools/lieutenant-operator/explanation/templating.html)
+                  to set defaults for the clusters of this tenant. The fields within
+                  this can use Go templating. See https://syn.tools/lieutenant-operator/explanations/templating.html
                   for details.
                 properties:
                   deletionPolicy:

diff --git a/tests/golden/defaults/lieutenant/lieutenant/10_operator/deployment.yaml b/tests/golden/defaults/lieutenant/lieutenant/10_operator/deployment.yaml
@@ -41,7 +41,7 @@ spec:
               value: 'false'
             - name: SKIP_VAULT_SETUP
               value: 'true'
-          image: quay.io/projectsyn/lieutenant-operator:1.1.2
+          image: quay.io/projectsyn/lieutenant-operator:1.3.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/tests/unit/defaults_test.go b/tests/unit/defaults_test.go
@@ -19,7 +19,7 @@ var (
 	namespace = "lieutenant"
 
 	operator      = "lieutenant-operator-controller-manager"
-	operatorImage = "quay.io/projectsyn/lieutenant-operator:1.1.2"
+	operatorImage = "quay.io/projectsyn/lieutenant-operator:1.3.0"
 
 	api            = "lieutenant-api"
 	apiImage       = "docker.io/projectsyn/lieutenant-api:v0.8.0"