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

Merge pull request #5743 from kulong0105/master

Browse source 
build/dev-env.sh: remove docker version check
This commit is contained in:
Kubernetes Prow Robot 2020-06-23 14:39:17 -07:00 • committed by GitHub
commit d3832915e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/annotations/class/main.go
View file

@ -29,7 +29,7 @@ const (
)
var (
// DefaultClass defines the default class used in the nginx ingres controller
// DefaultClass defines the default class used in the nginx ingress controller
DefaultClass = "nginx"
// IngressClass sets the runtime ingress class to use

4
internal/ingress/controller/nginx.go
View file

@ -46,7 +46,7 @@ import (
"k8s.io/client-go/util/flowcontrol"
"k8s.io/klog"
adm_controler "k8s.io/ingress-nginx/internal/admission/controller"
adm_controller "k8s.io/ingress-nginx/internal/admission/controller"
"k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
@ -113,7 +113,7 @@ func NewNGINXController(config *Configuration, mc metric.Collector) *NGINXContro
if n.cfg.ValidationWebhook != "" {
n.validationWebhookServer = &http.Server{
Addr: config.ValidationWebhook,
Handler: adm_controler.NewAdmissionControllerServer(&adm_controler.IngressAdmission{Checker: n}),
Handler: adm_controller.NewAdmissionControllerServer(&adm_controller.IngressAdmission{Checker: n}),
TLSConfig: ssl.NewTLSListener(n.cfg.ValidationWebhookCertPath, n.cfg.ValidationWebhookKeyPath).TLSConfig(),
}
}