From 6a556ca8e56cb0b3b68c09c87c4aa2480e2c7efb Mon Sep 17 00:00:00 2001 From: Rafael Grigorian Date: Fri, 20 Sep 2019 19:39:26 -0500 Subject: [PATCH] [incubator-vault] Fixes compatibility with 1.16 (#17324) Notice of deprecation: https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16 Signed-off-by: Rafael Grigorian --- incubator/vault/Chart.yaml | 2 +- incubator/vault/templates/deployment.yaml | 9 ++++++++- incubator/vault/templates/ingress.yaml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/incubator/vault/Chart.yaml b/incubator/vault/Chart.yaml index 4277d8157b..d4f41eea87 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.21.0 +version: 0.21.1 appVersion: 1.1.2 home: https://www.vaultproject.io/ icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg diff --git a/incubator/vault/templates/deployment.yaml b/incubator/vault/templates/deployment.yaml index efa409dd63..9636749b47 100644 --- a/incubator/vault/templates/deployment.yaml +++ b/incubator/vault/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "vault.fullname" . }} @@ -13,6 +13,13 @@ metadata: annotations: {{ toYaml .Values.annotations | indent 4 }} spec: + selector: + matchLabels: + app: {{ template "vault.name" . }} + release: {{ .Release.Name }} +{{- if .Values.podLabels }} +{{ toYaml .Values.podLabels | indent 6 }} +{{- end }} replicas: {{ .Values.replicaCount }} strategy: type: RollingUpdate diff --git a/incubator/vault/templates/ingress.yaml b/incubator/vault/templates/ingress.yaml index bf569f5f4e..6ab1192a8a 100644 --- a/incubator/vault/templates/ingress.yaml +++ b/incubator/vault/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $serviceName := include "vault.fullname" . -}} {{- $servicePort := .Values.service.externalPort -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: {{ template "vault.fullname" . }}