From: Krzysztof Kuzmicki Date: Fri, 3 Jul 2020 07:48:21 +0000 (+0200) Subject: Make COMMON/COMMON compatible with Kubernetes v1.17 X-Git-Tag: 7.0.0~371^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=54e812d8c55558957fcc876975f4debffa517796 Make COMMON/COMMON compatible with Kubernetes v1.17 Issue-ID: OOM-2478 Signed-off-by: Krzysztof Kuzmicki Change-Id: I7ec0b7469c1525fc1d73adaa7a8893d6effc6141 --- 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