From b21b37b07a439e8c0ae6ddd133aca71c719a01ca Mon Sep 17 00:00:00 2001 From: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Date: Tue, 25 May 2021 13:46:48 -0400 Subject: [PATCH] Update to v0.12.0 (#532) * Update to v0.12.0 * Update values.schema.json * Fix schema types * revert image repo --- CHANGELOG.md | 2 + Chart.yaml | 4 +- test/acceptance/server-ha-enterprise-dr.bats | 4 +- .../acceptance/server-ha-enterprise-perf.bats | 4 +- values.schema.json | 161 ++++++++++++++---- values.yaml | 6 +- 6 files changed, 141 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4385a7420..5b9459835 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased +## 0.12.0 (May 25th, 2021) + Features: * Pass additional arguments to `vault-csi-provider` using `csi.extraArgs` [GH-526](https://github.com/hashicorp/vault-helm/pull/526) diff --git a/Chart.yaml b/Chart.yaml index f048aee9c..4bd306fdc 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: vault -version: 0.11.0 -appVersion: 1.7.0 +version: 0.12.0 +appVersion: 1.7.2 kubeVersion: ">= 1.14.0-0" description: Official HashiCorp Vault Chart home: https://www.vaultproject.io diff --git a/test/acceptance/server-ha-enterprise-dr.bats b/test/acceptance/server-ha-enterprise-dr.bats index 5b04d2c01..55182441e 100644 --- a/test/acceptance/server-ha-enterprise-dr.bats +++ b/test/acceptance/server-ha-enterprise-dr.bats @@ -7,7 +7,7 @@ load _helpers helm install "$(name_prefix)-east" \ --set='server.image.repository=hashicorp/vault-enterprise' \ - --set='server.image.tag=1.7.0_ent' \ + --set='server.image.tag=1.7.2_ent' \ --set='injector.enabled=false' \ --set='server.ha.enabled=true' \ --set='server.ha.raft.enabled=true' . @@ -76,7 +76,7 @@ load _helpers helm install "$(name_prefix)-west" \ --set='injector.enabled=false' \ --set='server.image.repository=hashicorp/vault-enterprise' \ - --set='server.image.tag=1.6.2_ent' \ + --set='server.image.tag=1.7.2_ent' \ --set='server.ha.enabled=true' \ --set='server.ha.raft.enabled=true' . wait_for_running "$(name_prefix)-west-0" diff --git a/test/acceptance/server-ha-enterprise-perf.bats b/test/acceptance/server-ha-enterprise-perf.bats index 5c9b0c547..7497dbc3e 100644 --- a/test/acceptance/server-ha-enterprise-perf.bats +++ b/test/acceptance/server-ha-enterprise-perf.bats @@ -8,7 +8,7 @@ load _helpers helm install "$(name_prefix)-east" \ --set='injector.enabled=false' \ --set='server.image.repository=hashicorp/vault-enterprise' \ - --set='server.image.tag=1.7.0_ent' \ + --set='server.image.tag=1.7.2_ent' \ --set='server.ha.enabled=true' \ --set='server.ha.raft.enabled=true' . wait_for_running "$(name_prefix)-east-0" @@ -76,7 +76,7 @@ load _helpers helm install "$(name_prefix)-west" \ --set='injector.enabled=false' \ --set='server.image.repository=hashicorp/vault-enterprise' \ - --set='server.image.tag=1.6.2_ent' \ + --set='server.image.tag=1.7.2_ent' \ --set='server.ha.enabled=true' \ --set='server.ha.raft.enabled=true' . wait_for_running "$(name_prefix)-west-0" diff --git a/values.schema.json b/values.schema.json index c3999654b..87130e998 100644 --- a/values.schema.json +++ b/values.schema.json @@ -9,7 +9,10 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "updateStrategy": { "type": "object", @@ -71,7 +74,13 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] + }, + "tolerations": { + "type": ["null", "string"] } } }, @@ -102,15 +111,24 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] } } }, "volumeMounts": { - "type": ["null", "array"] + "type": [ + "null", + "array" + ] }, "volumes": { - "type": ["null", "array"] + "type": [ + "null", + "array" + ] } } }, @@ -130,7 +148,10 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enable": { "type": "boolean" @@ -180,7 +201,10 @@ } }, "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "authPath": { "type": "string" @@ -198,7 +222,10 @@ "type": "string" }, "secretName": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] } } }, @@ -298,12 +325,18 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] } } }, "tolerations": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] } } }, @@ -314,7 +347,10 @@ "type": "string" }, "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "auditStorage": { "type": "object", @@ -323,10 +359,16 @@ "type": "string" }, "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enabled": { - "type": ["boolean", "string"] + "type": [ + "boolean", + "string" + ] }, "mountPath": { "type": "string" @@ -335,7 +377,10 @@ "type": "string" }, "storageClass": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] } } }, @@ -354,10 +399,16 @@ "type": "string" }, "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enabled": { - "type": ["boolean", "string"] + "type": [ + "boolean", + "string" + ] }, "mountPath": { "type": "string" @@ -366,7 +417,10 @@ "type": "string" }, "storageClass": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] } } }, @@ -388,13 +442,19 @@ "type": "string" }, "extraContainers": { - "type": ["null", "array"] + "type": [ + "null", + "array" + ] }, "extraEnvironmentVars": { "type": "object" }, "extraInitContainers": { - "type": ["null", "array"] + "type": [ + "null", + "array" + ] }, "extraLabels": { "type": "object" @@ -409,7 +469,10 @@ "type": "object", "properties": { "apiAddr": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] }, "config": { "type": "string" @@ -465,7 +528,10 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enabled": { "type": "boolean" @@ -539,7 +605,10 @@ } }, "nodeSelector": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] }, "postStart": { "type": "array" @@ -580,7 +649,10 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enabled": { "type": "boolean" @@ -597,7 +669,10 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enabled": { "type": "boolean" @@ -614,7 +689,10 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "create": { "type": "boolean" @@ -634,7 +712,10 @@ "type": "string" }, "enabled": { - "type": ["string", "boolean"] + "type": [ + "string", + "boolean" + ] } } }, @@ -642,21 +723,33 @@ "type": "object", "properties": { "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] } } }, "tolerations": { - "type": ["null", "string"] + "type": [ + "null", + "string" + ] }, "updateStrategyType": { "type": "string" }, "volumeMounts": { - "type": ["null", "array"] + "type": [ + "null", + "array" + ] }, "volumes": { - "type": ["null", "array"] + "type": [ + "null", + "array" + ] } } }, @@ -667,7 +760,10 @@ "type": "boolean" }, "annotations": { - "type": ["object", "string"] + "type": [ + "object", + "string" + ] }, "enabled": { "type": "boolean" @@ -683,6 +779,9 @@ }, "serviceType": { "type": "string" + }, + "targetPort": { + "type": "integer" } } } diff --git a/values.yaml b/values.yaml index 5fe4290d5..acab97a3b 100644 --- a/values.yaml +++ b/values.yaml @@ -52,7 +52,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.10.0" + tag: "0.10.1" pullPolicy: IfNotPresent # agentImage sets the repo and tag of the Vault image to use for the Vault Agent @@ -60,7 +60,7 @@ injector: # required. agentImage: repository: "vault" - tag: "1.7.0" + tag: "1.7.2" # The default values for the injected Vault Agent containers. agentDefaults: @@ -204,7 +204,7 @@ server: image: repository: "vault" - tag: "1.7.0" + tag: "1.7.2" # Overrides the default Image Pull Policy pullPolicy: IfNotPresent