Skip to content

Commit

Permalink
more updates of vault to openbao, and more updates of old k8s versions
Browse files Browse the repository at this point in the history
Signed-off-by: jessebot <[email protected]>
  • Loading branch information
jessebot authored and naphelps committed May 29, 2024
1 parent 547020f commit d5dba29
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions test/unit/csi-daemonset.bats
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ load _helpers
--set "csi.enabled=true" \
. | tee /dev/stderr |
yq -r '.spec.template.spec.containers[0].args[2]' | tee /dev/stderr)
[ "${actual}" = "--hmac-secret-name=vault-csi-provider-hmac-key" ]
[ "${actual}" = "--hmac-secret-name=openbao-csi-provider-hmac-key" ]

local actual=$(helm template \
--show-only templates/csi-daemonset.yaml \
Expand Down Expand Up @@ -688,7 +688,7 @@ load _helpers

local value=$(echo $object |
yq -r 'map(select(.name=="VAULT_ADDR")) | .[] .value' | tee /dev/stderr)
[ "${value}" = "http://not-external-test-vault.default.svc:8200" ]
[ "${value}" = "http://not-external-test-openbao.default.svc:8200" ]
}

@test "csi/daemonset: with global.externalVaultAddr" {
Expand Down
4 changes: 2 additions & 2 deletions test/unit/csi-role.bats
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ load _helpers
--set "csi.enabled=true" \
. | tee /dev/stderr |
yq -r '.rules[0].resourceNames[0]' | tee /dev/stderr)
[ "${actual}" = "vault-csi-provider-hmac-key" ]
[ "${actual}" = "openbao-csi-provider-hmac-key" ]
}

@test "csi/Role: namespace" {
Expand Down Expand Up @@ -55,4 +55,4 @@ load _helpers
. | tee /dev/stderr |
yq -r '.rules[0].resourceNames[0]' | tee /dev/stderr)
[ "${actual}" = "foo" ]
}
}
10 changes: 5 additions & 5 deletions test/unit/server-ingress.bats
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ load _helpers
[ "${actual}" = "release-name-openbao" ]
}

@test "server/ingress: k8s 1.26.3 uses correct service format when not ha - yaml" {
@test "server/ingress: k8s 1.27.0 uses correct service format when not ha - yaml" {
cd `chart_dir`

local actual=$(helm template \
Expand All @@ -225,7 +225,7 @@ load _helpers
--set 'server.dev.enabled=false' \
--set 'server.ha.enabled=false' \
--set 'server.service.enabled=true' \
--kube-version 1.26.3 \
--kube-version 1.27.0 \
. | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].backend.service.name' | tee /dev/stderr)
[ "${actual}" = "release-name-openbao" ]
Expand All @@ -246,14 +246,14 @@ load _helpers
[ "${actual}" = "release-name-openbao" ]
}

@test "server/ingress: pathType is added to Kubernetes version == 1.26.3" {
@test "server/ingress: pathType is added to Kubernetes version == 1.27.0" {
cd `chart_dir`

local actual=$(helm template \
--show-only templates/server-ingress.yaml \
--set 'server.ingress.enabled=true' \
--set server.ingress.pathType=ImplementationSpecific \
--kube-version 1.26.3 \
--kube-version 1.27.0 \
. | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].pathType' | tee /dev/stderr)
[ "${actual}" = "ImplementationSpecific" ]
Expand All @@ -266,7 +266,7 @@ load _helpers
--show-only templates/server-ingress.yaml \
--set 'server.ingress.enabled=true' \
--set server.ingress.pathType=Prefix \
--kube-version 1.26.3 \
--kube-version 1.27.0 \
. | tee /dev/stderr |
yq -r '.spec.rules[0].http.paths[0].pathType' | tee /dev/stderr)
[ "${actual}" = "Prefix" ]
Expand Down

0 comments on commit d5dba29

Please sign in to comment.