Skip to content

Commit 7b0b1aa

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #380 from tomhjp/fix-vault-tests-for-0.0.6
Fix vault bats tests for running against v0.0.6 of the provider
2 parents b4ee95f + 8b20155 commit 7b0b1aa

5 files changed

+51
-47
lines changed

‎test/bats/tests/vault/vault_synck8s_v1alpha1_secretproviderclass.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ spec:
1010
labels:
1111
environment: "test"
1212
data:
13-
- objectName: foo
13+
- objectName: bar
1414
key: pwd
15-
- objectName: foo1
15+
- objectName: bar1
1616
key: username
1717
parameters:
1818
roleName: "example-role"
@@ -21,10 +21,10 @@ spec:
2121
objects: |
2222
array:
2323
- |
24-
objectPath: "/foo"
24+
objectPath: "v1/secret/foo"
2525
objectName: "bar"
2626
objectVersion: ""
2727
- |
28-
objectPath: "/foo1"
29-
objectName: "bar"
28+
objectPath: "v1/secret/foo1"
29+
objectName: "bar1"
3030
objectVersion: ""

‎test/bats/tests/vault/vault_v1alpha1_multiple_secretproviderclass.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ spec:
88
- secretName: foosecret-0
99
type: Opaque
1010
data:
11-
- objectName: foo
11+
- objectName: bar
1212
key: pwd
13-
- objectName: foo1
13+
- objectName: bar1
1414
key: username
1515
parameters:
1616
roleName: "example-role"
@@ -19,12 +19,12 @@ spec:
1919
objects: |
2020
array:
2121
- |
22-
objectPath: "/foo"
22+
objectPath: "v1/secret/foo"
2323
objectName: "bar"
2424
objectVersion: ""
2525
- |
26-
objectPath: "/foo1"
27-
objectName: "bar"
26+
objectPath: "v1/secret/foo1"
27+
objectName: "bar1"
2828
objectVersion: ""
2929
---
3030
apiVersion: secrets-store.csi.x-k8s.io/v1alpha1
@@ -37,9 +37,9 @@ spec:
3737
- secretName: foosecret-1
3838
type: Opaque
3939
data:
40-
- objectName: foo
40+
- objectName: bar
4141
key: pwd
42-
- objectName: foo1
42+
- objectName: bar1
4343
key: username
4444
parameters:
4545
roleName: "example-role"
@@ -48,10 +48,10 @@ spec:
4848
objects: |
4949
array:
5050
- |
51-
objectPath: "/foo"
51+
objectPath: "v1/secret/foo"
5252
objectName: "bar"
5353
objectVersion: ""
5454
- |
55-
objectPath: "/foo1"
56-
objectName: "bar"
55+
objectPath: "v1/secret/foo1"
56+
objectName: "bar1"
5757
objectVersion: ""

‎test/bats/tests/vault/vault_v1alpha1_secretproviderclass.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ spec:
1111
objects: |
1212
array:
1313
- |
14-
objectPath: "/foo"
14+
objectPath: "v1/secret/foo"
1515
objectName: "bar"
1616
objectVersion: ""
1717
- |
18-
objectPath: "/foo1"
19-
objectName: "bar"
18+
objectPath: "v1/secret/foo1"
19+
objectName: "bar1"
2020
objectVersion: ""

‎test/bats/tests/vault/vault_v1alpha1_secretproviderclass_ns.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ spec:
99
- secretName: foosecret
1010
type: Opaque
1111
data:
12-
- objectName: foo
12+
- objectName: bar
1313
key: pwd
14-
- objectName: foo1
14+
- objectName: bar1
1515
key: username
1616
parameters:
1717
roleName: "example-role"
@@ -20,12 +20,12 @@ spec:
2020
objects: |
2121
array:
2222
- |
23-
objectPath: "/foo"
23+
objectPath: "v1/secret/foo"
2424
objectName: "bar"
2525
objectVersion: ""
2626
- |
27-
objectPath: "/foo1"
28-
objectName: "bar"
27+
objectPath: "v1/secret/foo1"
28+
objectName: "bar1"
2929
objectVersion: ""
3030
---
3131
apiVersion: secrets-store.csi.x-k8s.io/v1alpha1
@@ -39,9 +39,9 @@ spec:
3939
- secretName: foosecret
4040
type: Opaque
4141
data:
42-
- objectName: foo
42+
- objectName: bar
4343
key: pwd
44-
- objectName: foo1
44+
- objectName: bar1
4545
key: username
4646
parameters:
4747
roleName: "example-role"
@@ -50,10 +50,10 @@ spec:
5050
objects: |
5151
array:
5252
- |
53-
objectPath: "/foo"
53+
objectPath: "v1/secret/foo"
5454
objectName: "bar"
5555
objectVersion: ""
5656
- |
57-
objectPath: "/foo1"
58-
objectName: "bar"
57+
objectPath: "v1/secret/foo1"
58+
objectName: "bar1"
5959
objectVersion: ""

‎test/bats/vault.bats

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,21 @@ EOF
8686
assert_success
8787

8888
run kubectl exec -ti $VAULT_POD -- vault policy write example-readonly -<<EOF
89+
path "sys/mounts" {
90+
capabilities = ["read"]
91+
}
92+
8993
path "secret/data/foo" {
90-
capabilities = ["read", "list"]
91-
}
94+
capabilities = ["read", "list"]
95+
}
9296
93-
path "secret/data/foo1" {
94-
capabilities = ["read", "list"]
95-
}
97+
path "secret/data/foo1" {
98+
capabilities = ["read", "list"]
99+
}
96100
97-
path "sys/renew/*" {
98-
capabilities = ["update"]
99-
}
101+
path "sys/renew/*" {
102+
capabilities = ["update"]
103+
}
100104
EOF
101105
assert_success
102106

@@ -110,7 +114,7 @@ EOF
110114
run kubectl exec $VAULT_POD -- vault kv put secret/foo bar=hello
111115
assert_success
112116

113-
run kubectl exec $VAULT_POD -- vault kv put secret/foo1 bar=hello1
117+
run kubectl exec $VAULT_POD -- vault kv put secret/foo1 bar1=hello1
114118
assert_success
115119
}
116120

@@ -145,10 +149,10 @@ EOF
145149
}
146150

147151
@test "CSI inline volume test with pod portability - read vault secret from pod" {
148-
result=$(kubectl exec nginx-secrets-store-inline -- cat /mnt/secrets-store/foo)
152+
result=$(kubectl exec nginx-secrets-store-inline -- cat /mnt/secrets-store/bar)
149153
[[ "$result" == "hello" ]]
150154

151-
result=$(kubectl exec nginx-secrets-store-inline -- cat /mnt/secrets-store/foo1)
155+
result=$(kubectl exec nginx-secrets-store-inline -- cat /mnt/secrets-store/bar1)
152156
[[ "$result" == "hello1" ]]
153157
}
154158

@@ -175,10 +179,10 @@ EOF
175179

176180
@test "Sync with K8s secrets - read secret from pod, read K8s secret, read env var, check secret ownerReferences with multiple owners" {
177181
POD=$(kubectl get pod -l app=nginx -o jsonpath="{.items[0].metadata.name}")
178-
result=$(kubectl exec $POD -- cat /mnt/secrets-store/foo)
182+
result=$(kubectl exec $POD -- cat /mnt/secrets-store/bar)
179183
[[ "$result" == "hello" ]]
180184

181-
result=$(kubectl exec $POD -- cat /mnt/secrets-store/foo1)
185+
result=$(kubectl exec $POD -- cat /mnt/secrets-store/bar1)
182186
[[ "$result" == "hello1" ]]
183187

184188
result=$(kubectl get secret foosecret -o jsonpath="{.data.pwd}" | base64 -d)
@@ -239,10 +243,10 @@ EOF
239243

240244
@test "Test Namespaced scope SecretProviderClass - Sync with K8s secrets - read secret from pod, read K8s secret, read env var, check secret ownerReferences" {
241245
POD=$(kubectl get pod -l app=nginx -n test-ns -o jsonpath="{.items[0].metadata.name}")
242-
result=$(kubectl exec -n test-ns $POD -- cat /mnt/secrets-store/foo)
246+
result=$(kubectl exec -n test-ns $POD -- cat /mnt/secrets-store/bar)
243247
[[ "$result" == "hello" ]]
244248

245-
result=$(kubectl exec -n test-ns $POD -- cat /mnt/secrets-store/foo1)
249+
result=$(kubectl exec -n test-ns $POD -- cat /mnt/secrets-store/bar1)
246250
[[ "$result" == "hello1" ]]
247251

248252
result=$(kubectl get secret foosecret -n test-ns -o jsonpath="{.data.pwd}" | base64 -d)
@@ -309,10 +313,10 @@ EOF
309313
}
310314

311315
@test "CSI inline volume test with multiple secret provider class" {
312-
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-0/foo)
316+
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-0/bar)
313317
[[ "$result" == "hello" ]]
314318

315-
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-0/foo1)
319+
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-0/bar1)
316320
[[ "$result" == "hello1" ]]
317321

318322
result=$(kubectl get secret foosecret-0 -o jsonpath="{.data.pwd}" | base64 -d)
@@ -324,10 +328,10 @@ EOF
324328
run wait_for_process $WAIT_TIME $SLEEP_TIME "compare_owner_count foosecret-0 default 1"
325329
assert_success
326330

327-
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-1/foo)
331+
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-1/bar)
328332
[[ "$result" == "hello" ]]
329333

330-
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-1/foo1)
334+
result=$(kubectl exec nginx-secrets-store-inline-multiple-crd -- cat /mnt/secrets-store-1/bar1)
331335
[[ "$result" == "hello1" ]]
332336

333337
result=$(kubectl get secret foosecret-1 -o jsonpath="{.data.pwd}" | base64 -d)

0 commit comments

Comments
 (0)