Merge branch 'develop' into DATAGO-30302/upgrading-vault-to-1.8.11

CHANGELOG.md

@@ -56,7 +56,6 @@ Improvements:
 * Add `server.route.activeService` to configure if the route should use the active service [GH-570](https://github.com/hashicorp/vault-helm/pull/570)
 * Support configuring `global.imagePullSecrets` from a string array [GH-576](https://github.com/hashicorp/vault-helm/pull/576)
 
-
 ## 0.13.0 (June 17th, 2021)
 
 Improvements:

Makefile

@@ -4,6 +4,7 @@ CLOUDSDK_CORE_PROJECT?=vault-helm-dev-246514
 # set to run a single test - e.g acceptance/server-ha-enterprise-dr.bats
 ACCEPTANCE_TESTS?=acceptance
 
+
 # filter bats unit tests to run.
 UNIT_TESTS_FILTER?='.*'
 

README.md

@@ -47,7 +47,6 @@ Please see the many options supported in the `values.yaml`
 file. These are also fully documented directly on the
 [Vault website](https://www.vaultproject.io/docs/platform/k8s/helm.html).
 
-
 ## Customizations
 
 This Helm chart has been customized in the following ways:

templates/_helpers.tpl

@@ -572,12 +572,14 @@ Sets the injector toleration for pod placement
 {{- define "csi.pod.tolerations" -}}
   {{- if .Values.csi.pod.tolerations }}
       tolerations:
+
       {{- $tp := typeOf .Values.csi.pod.tolerations }}
       {{- if eq $tp "string" }}
         {{ tpl .Values.csi.pod.tolerations . | nindent 8 | trim }}
       {{- else }}
         {{- toYaml .Values.csi.pod.tolerations | nindent 8 }}
       {{- end }}
+
   {{- end }}
 {{- end -}}
 

test/acceptance/csi.bats

@@ -11,6 +11,7 @@ load _helpers
   # Install Secrets Store CSI driver
   CSI_DRIVER_VERSION=0.2.0
   helm install secrets-store-csi-driver https://github.com/kubernetes-sigs/secrets-store-csi-driver/blob/v${CSI_DRIVER_VERSION}/charts/secrets-store-csi-driver-${CSI_DRIVER_VERSION}.tgz?raw=true \
+
     --wait --timeout=5m \
     --namespace=acceptance \
     --set linux.image.pullPolicy="IfNotPresent"

test/chart/verifier.bats

@@ -77,6 +77,44 @@ teardown_file() {
 
 @test "images-are-certified" {
     check_result v1.0/images-are-certified
+=======
+    check_result has-kubeversion
+}
+
+@test "is-helm-v3" {
+    check_result is-helm-v3
+}
+
+@test "not-contains-crds" {
+    check_result not-contains-crds
+}
+
+@test "helm-lint" {
+    check_result helm-lint
+}
+
+@test "not-contain-csi-objects" {
+    check_result not-contain-csi-objects
+}
+
+@test "has-readme" {
+    check_result has-readme
+}
+
+@test "contains-values" {
+    check_result contains-values
+}
+
+@test "contains-values-schema" {
+    check_result contains-values-schema
+}
+
+@test "contains-test" {
+    check_result contains-test
+}
+
+@test "images-are-certified" {
+    check_result images-are-certified
 }
 
 @test "chart-testing" {

test/unit/csi-daemonset.bats

@@ -273,7 +273,9 @@ load _helpers
   [ "${actual}" = "true" ]
 }
 
+
 @test "csi/daemonset: tolerations can be set as string" {
+
   cd `chart_dir`
   local actual=$(helm template \
       --show-only templates/csi-daemonset.yaml  \

test/unit/injector-deployment.bats

@@ -342,7 +342,6 @@ load _helpers
   local value=$(echo $object |
       yq -r 'map(select(.name=="FOO")) | .[] .value' | tee /dev/stderr)
   [ "${value}" = "bar" ]
-
   local value=$(echo $object |
       yq -r 'map(select(.name=="FOOBAR")) | .[] .value' | tee /dev/stderr)
   [ "${value}" = "foobar" ]
@@ -671,7 +670,6 @@ load _helpers
       yq -r 'map(select(.name=="AGENT_INJECT_DEFAULT_TEMPLATE")) | .[] .value' | tee /dev/stderr)
   [ "${value}" = "json" ]
 }
-
 @test "injector/deployment: agent default template_config.exit_on_retry_failure" {
   cd `chart_dir`
   local object=$(helm template \

test/unit/ui-service.bats

@@ -346,7 +346,6 @@ load _helpers
       yq -r '.spec.ports[0].nodePort' | tee /dev/stderr)
   [ "${actual}" = "123" ]
 }
-
 @test "ui/Service: LoadBalancer assert externalTrafficPolicy" {
   cd `chart_dir`
   local actual=$(helm template \

values.yaml

@@ -86,6 +86,7 @@ injector:
     templateConfig:
       exitOnRetryFailure: true
 
+
   # Mount Path of the Vault Kubernetes Auth Method.
   authPath: "auth/kubernetes"
 
@@ -231,6 +232,7 @@ server:
   image:
     repository: "hashicorp/vault"
     tag: "1.8.4"
+
     # Overrides the default Image Pull Policy
     pullPolicy: IfNotPresent
 
@@ -292,6 +294,7 @@ server:
     #       name: ssl-redirect
     #       port:
     #         number: use-annotation
+
     tls: []
     #  - secretName: chart-example-tls
     #    hosts:
@@ -798,6 +801,7 @@ csi:
     # Kubelet host path
     kubeletRootDir: "/var/lib/kubelet"
 
+
   pod:
     # Extra annotations for the provider pods. This can either be YAML or a
     # YAML-formatted multi-line templated string map of the annotations to apply