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

Merge pull request #4521 from johnlanni/update-webhook-validation

Browse source 
backward compatibility for k8s version < 1.14
This commit is contained in:
Kubernetes Prow Robot 2019-09-03 11:06:58 -07:00 committed by GitHub
commit 70450489ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ package controller
import ( import (
"github.com/google/uuid" "github.com/google/uuid"
"k8s.io/api/admission/v1beta1" "k8s.io/api/admission/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
@ -54,7 +55,9 @@ func (ia *IngressAdmission) HandleAdmission(ar *v1beta1.AdmissionReview) error {
ingressResource := v1.GroupVersionResource{Group: networking.SchemeGroupVersion.Group, Version: networking.SchemeGroupVersion.Version, Resource: "ingresses"} ingressResource := v1.GroupVersionResource{Group: networking.SchemeGroupVersion.Group, Version: networking.SchemeGroupVersion.Version, Resource: "ingresses"}
if ar.Request.Resource == ingressResource { oldIngressResource := v1.GroupVersionResource{Group: extensions.SchemeGroupVersion.Group, Version: extensions.SchemeGroupVersion.Version, Resource: "ingresses"}
if ar.Request.Resource == ingressResource || ar.Request.Resource == oldIngressResource {
ar.Response = &v1beta1.AdmissionResponse{ ar.Response = &v1beta1.AdmissionResponse{
UID: types.UID(uuid.New().String()), UID: types.UID(uuid.New().String()),
Allowed: false, Allowed: false,