Ingress API is served via networking.k8s.io/v1beta1 API

See kubernetes/kubernetes#74057
gardener · Mar 20, 2019 · 525f0df · 525f0df
1 parent 94cd93b
commit 525f0df
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 37 deletions.
diff --git a/charts/seed-bootstrap/charts/elastic-kibana-curator/templates/kibana/kibana-ingress.yaml b/charts/seed-bootstrap/charts/elastic-kibana-curator/templates/kibana/kibana-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "ingressversion" . }}
 kind: Ingress
 metadata:
   annotations:

diff --git a/charts/seed-controlplane/charts/kube-addon-manager/templates/_prune_whitelist.tpl b/charts/seed-controlplane/charts/kube-addon-manager/templates/_prune_whitelist.tpl
@@ -7,10 +7,10 @@
 core/v1/LimitRange
 core/v1/ResourceQuota
 core/v1/ServiceAccount
-extensions/v1beta1/Ingress
-extensions/v1beta1/PodSecurityPolicy
+{{ include "ingressversion" . }}/Ingress
+{{ include "podsecuritypolicyversion" .}}/PodSecurityPolicy
 {{ include "networkpolicyversion" . }}/NetworkPolicy
-policy/v1beta1/PodDisruptionBudget
+{{ include "poddisruptionbudgetversion" . }}/PodDisruptionBudget
 {{ include "rbacversion" . }}/ClusterRole
 {{ include "rbacversion" . }}/ClusterRoleBinding
 {{ include "rbacversion" . }}/Role

diff --git a/charts/seed-monitoring/charts/alertmanager/templates/ingress.yaml b/charts/seed-monitoring/charts/alertmanager/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.emailConfigs }}
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "ingressversion" . }}
 kind: Ingress
 metadata:
   annotations:
@@ -23,4 +23,4 @@ spec:
           serviceName: alertmanager-client
           servicePort: 9093
         path: /
-{{- end }}
+{{- end }}
diff --git a/charts/seed-monitoring/charts/grafana/templates/grafana-ingress.yaml b/charts/seed-monitoring/charts/grafana/templates/grafana-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "ingressversion" . }}
 kind: Ingress
 metadata:
   annotations:

diff --git a/charts/seed-monitoring/charts/prometheus/templates/ingress.yaml b/charts/seed-monitoring/charts/prometheus/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "ingressversion" . }}
 kind: Ingress
 metadata:
   annotations:

diff --git a/charts/shoot-addons/charts/kube-lego/templates/NOTES.txt b/charts/shoot-addons/charts/kube-lego/templates/NOTES.txt
diff --git a/charts/utils-templates/templates/_versions.tpl b/charts/utils-templates/templates/_versions.tpl
@@ -83,3 +83,11 @@ policy/v1beta1
 {{- define "podsecuritypolicyversion" -}}
 policy/v1beta1
 {{- end -}}
+
+{{- define "ingressversion" -}}
+{{- if semverCompare ">= 1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+networking.k8s.io/v1beta1
+{{- else -}}
+extensions/v1beta1
+{{- end -}}
+{{- end -}}
diff --git a/pkg/client/kubernetes/ingresses.go b/pkg/client/kubernetes/ingresses.go
@@ -14,7 +14,17 @@
 
 package kubernetes
 
+import "github.com/gardener/gardener/pkg/utils"
+
 // DeleteIngress deletes an Ingress object.
 func (c *Clientset) DeleteIngress(namespace, name string) error {
-	return c.kubernetes.ExtensionsV1beta1().Ingresses(namespace).Delete(name, &defaultDeleteOptions)
+	k8sVersionLessThan114, err := utils.CompareVersions(c.Version(), "<", "1.14")
+	if err != nil {
+		return err
+	}
+
+	if k8sVersionLessThan114 {
+		return c.kubernetes.ExtensionsV1beta1().Ingresses(namespace).Delete(name, &defaultDeleteOptions)
+	}
+	return c.kubernetes.NetworkingV1beta1().Ingresses(namespace).Delete(name, &defaultDeleteOptions)
 }