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

Fix incorrect uid in AdmissionResponse (#4927)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-01-14 16:42:58 -03:00 committed by GitHub
parent 26f574dc27
commit e726f25d03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,12 +17,10 @@ limitations under the License.
package controller package controller
import ( import (
"github.com/google/uuid"
"k8s.io/api/admission/v1beta1" "k8s.io/api/admission/v1beta1"
extensions "k8s.io/api/extensions/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/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/klog" "k8s.io/klog"
) )
@ -46,7 +44,6 @@ func (ia *IngressAdmission) HandleAdmission(ar *v1beta1.AdmissionReview) error {
if ar.Request == nil { if ar.Request == nil {
klog.Infof("rejecting nil request") klog.Infof("rejecting nil request")
ar.Response = &v1beta1.AdmissionResponse{ ar.Response = &v1beta1.AdmissionResponse{
UID: types.UID(uuid.New().String()),
Allowed: false, Allowed: false,
} }
return nil return nil
@ -59,7 +56,7 @@ func (ia *IngressAdmission) HandleAdmission(ar *v1beta1.AdmissionReview) error {
if ar.Request.Resource == ingressResource || ar.Request.Resource == oldIngressResource { if ar.Request.Resource == ingressResource || ar.Request.Resource == oldIngressResource {
ar.Response = &v1beta1.AdmissionResponse{ ar.Response = &v1beta1.AdmissionResponse{
UID: types.UID(uuid.New().String()), UID: ar.Request.UID,
Allowed: false, Allowed: false,
} }
ingress := networking.Ingress{} ingress := networking.Ingress{}
@ -89,7 +86,7 @@ func (ia *IngressAdmission) HandleAdmission(ar *v1beta1.AdmissionReview) error {
klog.Infof("accepting non ingress %s in namespace %s %s", ar.Request.Name, ar.Request.Namespace, ar.Request.Resource.String()) klog.Infof("accepting non ingress %s in namespace %s %s", ar.Request.Name, ar.Request.Namespace, ar.Request.Resource.String())
ar.Response = &v1beta1.AdmissionResponse{ ar.Response = &v1beta1.AdmissionResponse{
UID: types.UID(uuid.New().String()), UID: ar.Request.UID,
Allowed: true, Allowed: true,
} }
return nil return nil

4
internal/admission/controller/server_test.go
View file

@ -24,18 +24,16 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/google/uuid"
"k8s.io/api/admission/v1beta1" "k8s.io/api/admission/v1beta1"
"k8s.io/apimachinery/pkg/types"
) )
type testAdmissionHandler struct{} type testAdmissionHandler struct{}
func (testAdmissionHandler) HandleAdmission(ar *v1beta1.AdmissionReview) error { func (testAdmissionHandler) HandleAdmission(ar *v1beta1.AdmissionReview) error {
ar.Response = &v1beta1.AdmissionResponse{ ar.Response = &v1beta1.AdmissionResponse{
UID: types.UID(uuid.New().String()),
Allowed: true, Allowed: true,
} }
return nil return nil
} }