Skip to content

Commit

Permalink
build/dev-env.sh: remove docker version check
Browse files Browse the repository at this point in the history
docker experimental feature is unnecessary, so just remove it
  • Loading branch information
kulong0105 committed Jun 23, 2020
1 parent 2d51fbf commit 714637b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 12 deletions.
7 changes: 0 additions & 7 deletions build/dev-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion internal/ingress/annotations/class/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/ingress/controller/nginx.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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(),
}
}
Expand Down

0 comments on commit 714637b

Please sign in to comment.