From 7912d879ab8f75cb838e3c5f2d0609891d8eb93c Mon Sep 17 00:00:00 2001 From: Theron Voran Date: Mon, 23 Oct 2023 23:12:31 -0700 Subject: [PATCH 1/2] openshift/server: readiness probe passes when server uninitialized Changes the default server readiness probe to pass when the server is uninitialized, in order to pass the latest version of the chart-verifier test (see #954) for details. Also updates the chart-verifier used in our tests to 1.13.0 (latest). --- .github/workflows/tests.yaml | 4 ++-- CHANGELOG.md | 1 + values.openshift.yaml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 25f344db1..1a583b3e7 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -10,14 +10,14 @@ jobs: chart-verifier: runs-on: ubuntu-latest env: - CHART_VERIFIER_VERSION: '1.10.1' + CHART_VERIFIER_VERSION: '1.13.0' steps: - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Setup test tools uses: ./.github/actions/setup-test-tools - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.19.2' + go-version: '1.21.3' - run: go install "github.com/redhat-certification/chart-verifier@${CHART_VERIFIER_VERSION}" - run: bats --tap --timing ./test/chart permissions: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eea6ba87..34b9d4381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changes: * Default `vault` version updated to 1.15.0 * Default `vault-k8s` version updated to 1.3.0 * Tested with Kubernetes versions 1.24-1.28 +* server: OpenShift default readiness probe returns 204 when uninitialized Features: * server: Add support for dual stack clusters [GH-833](https://github.com/hashicorp/vault-helm/pull/833) diff --git a/values.openshift.yaml b/values.openshift.yaml index a68641f2f..e02d6d13f 100644 --- a/values.openshift.yaml +++ b/values.openshift.yaml @@ -19,3 +19,6 @@ server: image: repository: "registry.connect.redhat.com/hashicorp/vault" tag: "1.15.0-ubi" + + readinessProbe: + path: "/v1/sys/health?uninitcode=204" From 1cc04643f3727655fec4fcf3f8d165199f76a68a Mon Sep 17 00:00:00 2001 From: Theron Voran Date: Mon, 23 Oct 2023 23:29:25 -0700 Subject: [PATCH 2/2] changelog++ --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34b9d4381..5b076a1e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Changes: * Default `vault` version updated to 1.15.0 * Default `vault-k8s` version updated to 1.3.0 * Tested with Kubernetes versions 1.24-1.28 -* server: OpenShift default readiness probe returns 204 when uninitialized +* server: OpenShift default readiness probe returns 204 when uninitialized [GH-966](https://github.com/hashicorp/vault-helm/pull/966) Features: * server: Add support for dual stack clusters [GH-833](https://github.com/hashicorp/vault-helm/pull/833)