Skip to content

Commit

Permalink
Update vault-k8s to 1.0.0 (hashicorp#784)
Browse files Browse the repository at this point in the history
Update vault-k8s to 1.0.0

Also update Kubernetes versions tested against, including adding 1.25

Update consul in tests for Kubernetes 1.25 support
  • Loading branch information
swenson authored Sep 8, 2022
1 parent 0407431 commit 99d745c
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/acceptance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kind-k8s-version: [1.16.15, 1.20.15, 1.21.12, 1.22.9, 1.23.6, 1.24.1]
kind-k8s-version: [1.16.15, 1.20.15, 1.21.14, 1.22.13, 1.23.10, 1.24.4, 1.25.0]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## Unreleased

Features:
* Add PrometheusOperator support for collecting Vault server metrics. [GH-772](https://github.com/hashicorp/vault-helm/pull/772)

Changes:
* `vault-k8s` to 1.0.0 [GH-784](https://github.com/hashicorp/vault-helm/pull/784)
* Test against Kubernetes 1.25 [GH-784](https://github.com/hashicorp/vault-helm/pull/784)

## 0.21.0 (August 10th, 2022)

CHANGES:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LOCAL_ACCEPTANCE_TESTS?=false
KIND_CLUSTER_NAME?=vault-helm

# kind k8s version
KIND_K8S_VERSION?=v1.24.1
KIND_K8S_VERSION?=v1.25.0

# Generate json schema for chart values. See test/README.md for more details.
values-schema:
Expand Down
14 changes: 12 additions & 2 deletions test/acceptance/server-ha.bats
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,18 @@ setup() {
kubectl create namespace acceptance
kubectl config set-context --current --namespace=acceptance

helm install consul \
https://github.com/hashicorp/consul-helm/archive/v0.28.0.tar.gz \
helm repo add hashicorp https://helm.releases.hashicorp.com
helm repo update

CONSUL_HELM_VERSION=v0.48.0

K8S_MAJOR=$(kubectl version --output=json | jq -r .serverVersion.major)
K8S_MINOR=$(kubectl version --output=json | jq -r .serverVersion.minor)
if [ \( $K8S_MAJOR -eq 1 \) -a \( $K8S_MINOR -le 20 \) ]; then
CONSUL_HELM_VERSION=v0.32.1
fi
helm install consul hashicorp/consul \
--version $CONSUL_HELM_VERSION \
--set 'ui.enabled=false'

wait_for_running_consul
Expand Down
2 changes: 1 addition & 1 deletion values.openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ global:
injector:
image:
repository: "registry.connect.redhat.com/hashicorp/vault-k8s"
tag: "0.17.0-ubi"
tag: "1.0.0-ubi"

agentImage:
repository: "registry.connect.redhat.com/hashicorp/vault"
Expand Down
2 changes: 1 addition & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ injector:
# image sets the repo and tag of the vault-k8s image to use for the injector.
image:
repository: "hashicorp/vault-k8s"
tag: "0.17.0"
tag: "1.0.0"
pullPolicy: IfNotPresent

# agentImage sets the repo and tag of the Vault image to use for the Vault Agent
Expand Down

0 comments on commit 99d745c

Please sign in to comment.