Add VAULT_API_ADDR as environment var (#26)
This commit is contained in:
parent
abb2b6e56e
commit
acd1638b28
5 changed files with 32 additions and 29 deletions
|
@ -59,6 +59,8 @@ spec:
|
||||||
fieldPath: status.podIP
|
fieldPath: status.podIP
|
||||||
- name: VAULT_ADDR
|
- name: VAULT_ADDR
|
||||||
value: "{{ include "vault.scheme" . }}://127.0.0.1:8200"
|
value: "{{ include "vault.scheme" . }}://127.0.0.1:8200"
|
||||||
|
- name: VAULT_API_ADDR
|
||||||
|
value: "{{ include "vault.scheme" . }}://$(POD_IP):8200"
|
||||||
- name: SKIP_CHOWN
|
- name: SKIP_CHOWN
|
||||||
value: "true"
|
value: "true"
|
||||||
{{ template "vault.envs" . }}
|
{{ template "vault.envs" . }}
|
||||||
|
|
|
@ -224,19 +224,19 @@ load _helpers
|
||||||
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].name' | tee /dev/stderr)
|
yq -r '.[6].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOO" ]
|
[ "${actual}" = "FOO" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].value' | tee /dev/stderr)
|
yq -r '.[6].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "bar" ]
|
[ "${actual}" = "bar" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[6].name' | tee /dev/stderr)
|
yq -r '.[7].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOOBAR" ]
|
[ "${actual}" = "FOOBAR" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[6].value' | tee /dev/stderr)
|
yq -r '.[7].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "foobar" ]
|
[ "${actual}" = "foobar" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,23 +257,23 @@ load _helpers
|
||||||
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].name' | tee /dev/stderr)
|
yq -r '.[5].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "ENV_FOO_0" ]
|
[ "${actual}" = "ENV_FOO_0" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
yq -r '.[5].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_name_0" ]
|
[ "${actual}" = "secret_name_0" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
yq -r '.[5].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_key_0" ]
|
[ "${actual}" = "secret_key_0" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].name' | tee /dev/stderr)
|
yq -r '.[6].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "ENV_FOO_1" ]
|
[ "${actual}" = "ENV_FOO_1" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
yq -r '.[6].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_name_1" ]
|
[ "${actual}" = "secret_name_1" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
yq -r '.[6].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_key_1" ]
|
[ "${actual}" = "secret_key_1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -320,19 +320,19 @@ load _helpers
|
||||||
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].name' | tee /dev/stderr)
|
yq -r '.[5].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOO" ]
|
[ "${actual}" = "FOO" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].value' | tee /dev/stderr)
|
yq -r '.[5].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "bar" ]
|
[ "${actual}" = "bar" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].name' | tee /dev/stderr)
|
yq -r '.[6].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOOBAR" ]
|
[ "${actual}" = "FOOBAR" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].value' | tee /dev/stderr)
|
yq -r '.[6].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "foobar" ]
|
[ "${actual}" = "foobar" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -354,23 +354,23 @@ load _helpers
|
||||||
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].name' | tee /dev/stderr)
|
yq -r '.[5].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "ENV_FOO_0" ]
|
[ "${actual}" = "ENV_FOO_0" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
yq -r '.[5].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_name_0" ]
|
[ "${actual}" = "secret_name_0" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
yq -r '.[5].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_key_0" ]
|
[ "${actual}" = "secret_key_0" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].name' | tee /dev/stderr)
|
yq -r '.[6].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "ENV_FOO_1" ]
|
[ "${actual}" = "ENV_FOO_1" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
yq -r '.[6].valueFrom.secretKeyRef.name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_name_1" ]
|
[ "${actual}" = "secret_name_1" ]
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
yq -r '.[6].valueFrom.secretKeyRef.key' | tee /dev/stderr)
|
||||||
[ "${actual}" = "secret_key_1" ]
|
[ "${actual}" = "secret_key_1" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -296,19 +296,19 @@ load _helpers
|
||||||
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].name' | tee /dev/stderr)
|
yq -r '.[5].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOO" ]
|
[ "${actual}" = "FOO" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].value' | tee /dev/stderr)
|
yq -r '.[5].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "bar" ]
|
[ "${actual}" = "bar" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].name' | tee /dev/stderr)
|
yq -r '.[6].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOOBAR" ]
|
[ "${actual}" = "FOOBAR" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].value' | tee /dev/stderr)
|
yq -r '.[6].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "foobar" ]
|
[ "${actual}" = "foobar" ]
|
||||||
|
|
||||||
local object=$(helm template \
|
local object=$(helm template \
|
||||||
|
@ -319,19 +319,19 @@ load _helpers
|
||||||
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].name' | tee /dev/stderr)
|
yq -r '.[5].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOO" ]
|
[ "${actual}" = "FOO" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[4].value' | tee /dev/stderr)
|
yq -r '.[5].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "bar" ]
|
[ "${actual}" = "bar" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].name' | tee /dev/stderr)
|
yq -r '.[6].name' | tee /dev/stderr)
|
||||||
[ "${actual}" = "FOOBAR" ]
|
[ "${actual}" = "FOOBAR" ]
|
||||||
|
|
||||||
local actual=$(echo $object |
|
local actual=$(echo $object |
|
||||||
yq -r '.[5].value' | tee /dev/stderr)
|
yq -r '.[6].value' | tee /dev/stderr)
|
||||||
[ "${actual}" = "foobar" ]
|
[ "${actual}" = "foobar" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ global:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
# Image is the name (and tag) of the Vault Docker image.
|
# Image is the name (and tag) of the Vault Docker image.
|
||||||
image: "vault:1.2.1"
|
image: "vault:1.2.2"
|
||||||
# TLS for end-to-end encrypted transport
|
# TLS for end-to-end encrypted transport
|
||||||
tlsDisable: true
|
tlsDisable: true
|
||||||
|
|
||||||
|
@ -176,6 +176,7 @@ server:
|
||||||
# This should be HCL.
|
# This should be HCL.
|
||||||
config: |
|
config: |
|
||||||
ui = true
|
ui = true
|
||||||
|
|
||||||
listener "tcp" {
|
listener "tcp" {
|
||||||
tls_disable = 1
|
tls_disable = 1
|
||||||
address = "[::]:8200"
|
address = "[::]:8200"
|
||||||
|
|
Loading…
Reference in a new issue