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

build/dev-env.sh: remove docker version check

Browse source 
docker experimental feature is unnecessary, so just remove it
This commit is contained in:
Yilong Ren 2020-06-19 14:04:38 +08:00
parent 2d51fbf6fe
commit 714637bec5
4 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/dev-env.sh
View file

@ -40,11 +40,6 @@ if ! command -v kubectl &> /dev/null; then
exit 1 exit 1
fi fi
if ! docker buildx version &> /dev/null; then
echo "Make sure you have Docker 19.03 or higher and experimental features enabled"
exit 1
fi
if ! command -v helm &> /dev/null; then if ! command -v helm &> /dev/null; then
echo "Please install helm" echo "Please install helm"
exit 1 exit 1
@ -62,8 +57,6 @@ docker tag "${REGISTRY}/nginx-ingress-controller:${TAG}" "${DEV_IMAGE}"
export K8S_VERSION=${K8S_VERSION:-v1.18.0@sha256:0e20578828edd939d25eb98496a685c76c98d54084932f76069f886ec315d694} export K8S_VERSION=${K8S_VERSION:-v1.18.0@sha256:0e20578828edd939d25eb98496a685c76c98d54084932f76069f886ec315d694}
export DOCKER_CLI_EXPERIMENTAL=enabled
KIND_CLUSTER_NAME="ingress-nginx-dev" KIND_CLUSTER_NAME="ingress-nginx-dev"
if ! kind get clusters -q | grep -q ${KIND_CLUSTER_NAME}; then if ! kind get clusters -q | grep -q ${KIND_CLUSTER_NAME}; then

2
docs/development.md
View file

@ -19,8 +19,6 @@ cd ingress-nginx
### Initial developer environment build ### Initial developer environment build
Ensure docker experimental features option is enabled for [buildx](https://docs.docker.com/buildx/working-with-buildx/)
``` ```
$ make dev-env $ make dev-env
``` ```

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

@ -29,7 +29,7 @@ const (
) )
var ( 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" DefaultClass = "nginx"
// IngressClass sets the runtime ingress class to use // 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/client-go/util/flowcontrol"
"k8s.io/klog" "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/file"
"k8s.io/ingress-nginx/internal/ingress" "k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/class" "k8s.io/ingress-nginx/internal/ingress/annotations/class"
@ -113,7 +113,7 @@ func NewNGINXController(config *Configuration, mc metric.Collector) *NGINXContro
if n.cfg.ValidationWebhook != "" { if n.cfg.ValidationWebhook != "" {
n.validationWebhookServer = &http.Server{ n.validationWebhookServer = &http.Server{
Addr: config.ValidationWebhook, 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(), TLSConfig: ssl.NewTLSListener(n.cfg.ValidationWebhookCertPath, n.cfg.ValidationWebhookKeyPath).TLSConfig(),
} }
} }