diff --git a/incubator/vault/Chart.yaml b/incubator/vault/Chart.yaml index fa7e49b636..d9e10d5fd8 100644 --- a/incubator/vault/Chart.yaml +++ b/incubator/vault/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Vault, a tool for managing secrets name: vault -version: 0.8.0 +version: 0.9.0 appVersion: 0.10.1 home: https://www.vaultproject.io/ icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg diff --git a/incubator/vault/README.md b/incubator/vault/README.md index acfabd9d23..819d5effc1 100644 --- a/incubator/vault/README.md +++ b/incubator/vault/README.md @@ -54,12 +54,13 @@ The following table lists the configurable parameters of the Vault chart and the | `vault.dev` | Use Vault in dev mode | true (set to false in production) | | `vault.customSecrets` | Custom secrets available to Vault | `[]` | | `vault.config` | Vault configuration | No default backend | -| `replicaCount` | k8s replicas | `1` | +| `replicaCount` | k8s replicas | `3` | | `resources.limits.cpu` | Container requested CPU | `nil` | | `resources.limits.memory` | Container requested memory | `nil` | | `affinity` | Affinity settings | See values.yaml | | `service.annotations` | Annotations for service | `{}` | | `annotations` | Annotations for deployment | `{}` | +| `ingress.labels` | Labels for ingress | `{}` | | `podAnnotations` | Annotations for pods | `{}` | | `consulAgent.join` | If set, start start a consul agent | `nil` | | `consulAgent.repository` | Container image for consul agent | `consul` | diff --git a/incubator/vault/templates/ingress.yaml b/incubator/vault/templates/ingress.yaml index 9de4745f8e..2fef0771c7 100644 --- a/incubator/vault/templates/ingress.yaml +++ b/incubator/vault/templates/ingress.yaml @@ -10,6 +10,9 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" +{{- if .Values.ingress.labels }} +{{ toYaml .Values.ingress.labels | indent 4 }} +{{- end }} annotations: {{- range $key, $value := .Values.ingress.annotations }} {{ $key }}: {{ $value | quote }} diff --git a/incubator/vault/values.yaml b/incubator/vault/values.yaml index 74037bea44..d69d76b2cf 100644 --- a/incubator/vault/values.yaml +++ b/incubator/vault/values.yaml @@ -33,6 +33,7 @@ service: # cloud.google.com/load-balancer-type: "Internal" ingress: enabled: false + labels: {} # Used to create Ingress record (should used with service.type: ClusterIP). # hosts: # - chart-example.local