Skip to content

Commit e6f51b2

Browse files
committed
feat: e2e for vault with ibm power
Signed-off-by: Rajakumar Battula <rbattula@redhat.com>
1 parent 2525f6a commit e6f51b2

3 files changed

Lines changed: 19 additions & 15 deletions

File tree

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,17 @@ test-e2e: ## Run e2e tests against a cluster.
218218

219219
.PHONY: e2e-test-vault # Run the e2e tests against a Kind k8s instance that is spun up.
220220
e2e-test-vault:
221-
go test \
221+
`@go` test -C $(PROJECT_ROOT)/test \
222222
-timeout $(E2E_TIMEOUT) \
223223
-count 1 \
224224
-v \
225225
-p 1 \
226226
-tags e2e \
227-
./test/e2e \
227+
./e2e \
228228
-ginkgo.v \
229+
-ginkgo.trace \
229230
-ginkgo.show-node-events \
230-
-ginkgo.label-filter=$(E2E_GINKGO_LABEL_FILTER)
231+
-ginkgo.label-filter="$(E2E_GINKGO_LABEL_FILTER)"
231232

232233
.PHONY: test-apis
233234
test-apis: $(ENVTEST) $(GINKGO) ## Run API integration tests.

test/e2e/e2e_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,11 +1020,9 @@ func createVaultTestSecret(ctx context.Context, client *kubernetes.Clientset, to
10201020
}
10211021

10221022
cmd := exec.Command(
1023-
"oc", "exec", "-n", vaultNamespace, podName, "--", "sh", "-c",
1024-
fmt.Sprintf(
1025-
"vault kv put secret/%s %s=\"%s\"",
1026-
secretname, key, value,
1027-
),
1023+
"oc", "exec", "-n", vaultNamespace, podName, "--",
1024+
"vault", "kv", "put", fmt.Sprintf("secret/%s", secretname),
1025+
fmt.Sprintf("%s=%s", key, value),
10281026
)
10291027

10301028
out, err := utils.Run(cmd)

test/e2e/testdata/vault/vault.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ apiVersion: v1
33
kind: Namespace
44
metadata:
55
name: vault-test
6+
67
---
78
apiVersion: v1
89
kind: ServiceAccount
910
metadata:
1011
name: vault
1112
namespace: vault-test
13+
1214
---
1315
apiVersion: v1
1416
kind: ConfigMap
@@ -29,6 +31,7 @@ data:
2931
}
3032
3133
disable_mlock = true
34+
3235
---
3336
apiVersion: apps/v1
3437
kind: Deployment
@@ -53,19 +56,20 @@ spec:
5356
containers:
5457
- name: vault
5558
image: icr.io/ppc64le-oss/vault-ppc64le:v1.14.8
56-
command: ["vault"]
59+
command:
60+
- vault
5761
args:
5862
- server
59-
- -config=/vault/config/vault.hcl
60-
env:
63+
- -config=/vault/config/vault.hcl
64+
env:
6165
- name: VAULT_API_ADDR
6266
value: http://vault.vault-test.svc.cluster.local:8200
6367
- name: VAULT_ADDR
6468
value: http://127.0.0.1:8200
6569
ports:
66-
- containerPort: 8200
67-
securityContext:
68-
allowPrivilegeEscalation: false
70+
- containerPort: 8200
71+
securityContext:
72+
allowPrivilegeEscalation: false
6973
capabilities:
7074
drop:
7175
- ALL
@@ -95,6 +99,7 @@ spec:
9599
name: vault-config
96100
- name: data
97101
emptyDir: {}
102+
98103
---
99104
apiVersion: v1
100105
kind: Service
@@ -107,4 +112,4 @@ spec:
107112
ports:
108113
- name: http
109114
port: 8200
110-
targetPort: 8200
115+
targetPort: 8200

0 commit comments

Comments
 (0)