Skip to content

Commit

Permalink
Preparing for v0.28.0 release (#1012)
Browse files Browse the repository at this point in the history
Updating values.schema.json and adding an updated link for
helm-schema-gen. Updating go, vault-k8s tag, chart-verifier
version. Print the reason a chart-verifier test fails, and ignore
stderr from chart-verifier output since that foils jq. Fix bats
install and update version.
  • Loading branch information
tvoran authored Apr 8, 2024
1 parent c5f9247 commit 0c6fd50
Show file tree
Hide file tree
Showing 11 changed files with 199 additions and 91 deletions.
4 changes: 2 additions & 2 deletions .github/actions/setup-test-tools/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ runs:
- uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: '16'
- run: npm install -g bats@${BATS_VERSION}
- run: sudo npm install -g bats@${BATS_VERSION}
shell: bash
env:
BATS_VERSION: '1.8.2'
BATS_VERSION: '1.11.0'
- run: bats -v
shell: bash
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
chart-verifier:
runs-on: ubuntu-latest
env:
CHART_VERIFIER_VERSION: '1.13.0'
CHART_VERIFIER_VERSION: '1.13.3'
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup test tools
uses: ./.github/actions/setup-test-tools
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.21.3'
go-version: '1.22.2'
- run: go install "github.com/redhat-certification/chart-verifier@${CHART_VERIFIER_VERSION}"
- run: bats --tap --timing ./test/chart
permissions:
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
## Unreleased

## 0.28.0 (April 8, 2024)

Changes:

* Default `vault` version updated to 1.16.1
* Default `vault-k8s` version updated to 1.4.1
* Default `vault-csi-provider` version updated to 1.4.2
* Tested with Kubernetes versions 1.25-1.29

Features:

* server: Add annotation on config change [GH-1001](https://github.com/hashicorp/vault-helm/pull/1001)

Bugs:

* injector: add missing `get` `nodes` permission to ClusterRole [GH-1005](https://github.com/hashicorp/vault-helm/pull/1005)

## 0.27.0 (November 16, 2023)
Expand Down
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

apiVersion: v2
name: vault
version: 0.27.0
appVersion: 1.15.2
version: 0.28.0
appVersion: 1.16.1
kubeVersion: ">= 1.20.0-0"
description: Official HashiCorp Vault Chart
home: https://www.vaultproject.io
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ There is a make target for generating values.schema.json:
It relies on the helm [schema-gen plugin][schema-gen]. Note that some manual
editing will be required, since several properties accept multiple data types.

[schema-gen]: https://github.com/karuppiah7890/helm-schema-gen
[schema-gen]: https://github.com/KnechtionsCoding/helm-schema-gen

## Helm test

Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/csi.bats
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ load _helpers
# Install Secrets Store CSI driver
# Configure it to pass in a JWT for the provider to use, and rotate secrets rapidly
# so we can see Agent's cache working.
CSI_DRIVER_VERSION=1.3.2
CSI_DRIVER_VERSION=1.4.2
helm install secrets-store-csi-driver secrets-store-csi-driver \
--repo https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts \
--version=$CSI_DRIVER_VERSION \
Expand Down
12 changes: 9 additions & 3 deletions test/chart/_helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# chart_dir returns the directory for the chart
chart_dir() {
echo ${BATS_TEST_DIRNAME}/../..
echo "${BATS_TEST_DIRNAME}"/../..
}

# check_result checks if the specified test passed
Expand All @@ -16,6 +16,12 @@ chart_dir() {
# }
check_result() {
local -r var="$1"
local check=$(cat $VERIFY_OUTPUT | jq -r ".results[] | select(.check==\"${var}\").outcome")
[ "$check" = "PASS" ]
local -r check=$(jq -r ".results[] | select(.check==\"${var}\")" < "$VERIFY_OUTPUT")
local -r outcome=$(jq -r .outcome <<< "$check")
local -r reason=$(jq -r .reason <<< "$check")

# print the reason if this fails
echo "reason: ${reason}"

[ "$outcome" = "PASS" ]
}
2 changes: 1 addition & 1 deletion test/chart/verifier.bats
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ setup_file() {
--output json \
--openshift-version $OPENSHIFT_VERSION \
--disable $DISABLED_TESTS \
--chart-values values.openshift.yaml 2>&1 | tee $VERIFY_OUTPUT
--chart-values values.openshift.yaml | tee $VERIFY_OUTPUT
}

teardown_file() {
Expand Down
6 changes: 3 additions & 3 deletions values.openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ global:
injector:
image:
repository: "registry.connect.redhat.com/hashicorp/vault-k8s"
tag: "1.3.1-ubi"
tag: "1.4.1-ubi"

agentImage:
repository: "registry.connect.redhat.com/hashicorp/vault"
tag: "1.15.2-ubi"
tag: "1.16.1-ubi"

server:
image:
repository: "registry.connect.redhat.com/hashicorp/vault"
tag: "1.15.2-ubi"
tag: "1.16.1-ubi"

readinessProbe:
path: "/v1/sys/health?uninitcode=204"
Loading

0 comments on commit 0c6fd50

Please sign in to comment.