DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Require Kubernetes v1.14 or higher and deprecate extensions

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-09-02 09:08:53 -04:00
parent f55a47e461
commit b1f0d28634
5 changed files with 14 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/admission/controller/main.go
View file

@ -20,7 +20,6 @@ import (
"fmt"
"k8s.io/api/admission/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
networking "k8s.io/api/networking/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"
@ -41,14 +40,8 @@ type IngressAdmission struct {
}
var (
extensionsResource = metav1.GroupVersionResource{
Group: networking.GroupName,
Version: "v1beta1",
Resource: "ingresses",
}
networkingResource = metav1.GroupVersionResource{
Group: extensions.GroupName,
Group: networking.GroupName,
Version: "v1beta1",
Resource: "ingresses",
}
@ -66,7 +59,7 @@ func (ia *IngressAdmission) HandleAdmission(ar *v1beta1.AdmissionReview) {
return
}
if ar.Request.Resource != extensionsResource && ar.Request.Resource != networkingResource {
if ar.Request.Resource != networkingResource {
err := fmt.Errorf("rejecting admission review because the request does not contains an Ingress resource but %s with name %s in namespace %s",
ar.Request.Resource.String(), ar.Request.Name, ar.Request.Namespace)
ar.Response = &v1beta1.AdmissionResponse{