From 714637bec598202ae54c218eef3529b4bf239734 Mon Sep 17 00:00:00 2001
From: Yilong Ren <yilong.ryl@alibaba-inc.com>
Date: Fri, 19 Jun 2020 14:04:38 +0800
Subject: [PATCH] build/dev-env.sh: remove docker version check

docker experimental feature is unnecessary, so just remove it
---
 build/dev-env.sh                           | 7 -------
 docs/development.md                        | 2 --
 internal/ingress/annotations/class/main.go | 2 +-
 internal/ingress/controller/nginx.go       | 4 ++--
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/build/dev-env.sh b/build/dev-env.sh
index 59682aa89..f84fb4449 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -40,11 +40,6 @@ if ! command -v kubectl &> /dev/null; then
   exit 1
 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
   echo "Please install helm"
   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 DOCKER_CLI_EXPERIMENTAL=enabled
-
 KIND_CLUSTER_NAME="ingress-nginx-dev"
 
 if ! kind get clusters -q | grep -q ${KIND_CLUSTER_NAME}; then
diff --git a/docs/development.md b/docs/development.md
index 20bd35f70..e2000e1cf 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -19,8 +19,6 @@ cd ingress-nginx
 
 ### Initial developer environment build
 
-Ensure docker experimental features option is enabled for [buildx](https://docs.docker.com/buildx/working-with-buildx/)
-
 ```
 $ make dev-env
 ```
diff --git a/internal/ingress/annotations/class/main.go b/internal/ingress/annotations/class/main.go
index 8c0684af3..ef8df711e 100644
--- a/internal/ingress/annotations/class/main.go
+++ b/internal/ingress/annotations/class/main.go
@@ -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
diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go
index af1e5027d..b47e8aac0 100644
--- a/internal/ingress/controller/nginx.go
+++ b/internal/ingress/controller/nginx.go
@@ -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(),
 		}
 	}