summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-07-06 10:06:20 +0000
committerGerrit Code Review <gerrit@onap.org>2020-07-06 10:06:20 +0000
commit26be143aefe2320c14cd0117a66f80a8a915c730 (patch)
tree3a56f07bddfdb07d4e06127ca149a0ea565e6318
parenta5a772ced3c8e3bed52642ad5444f839fa01c034 (diff)
parent54e812d8c55558957fcc876975f4debffa517796 (diff)
Merge "Make COMMON/COMMON compatible with Kubernetes v1.17"
-rw-r--r--kubernetes/common/common/templates/_ingress.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl
index c3c744358c..6b4f0ed36e 100644
--- a/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@ -78,7 +78,7 @@ nginx.ingress.kubernetes.io/ssl-redirect: "false"
{{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" (default (dict) .Values.global.ingress) "var" "enabled") }}
{{- $ingressEnabled := include "common.ingress._overrideIfDefined" (dict "currVal" $ingressEnabled "parent" .Values.ingress "var" "enabledOverride") }}
{{- if $ingressEnabled }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: {{ include "common.fullname" . }}-ingress