diff --git a/.travis.yml b/.travis.yml index 9a50aa9a15..2a44103bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ go_import_path: k8s.io/ingress-nginx env: global: - CHANGE_MINIKUBE_NONE_USER=true - - KUBERNETES_VERSION=v1.9.0 + - KUBERNETES_VERSION=v1.9.4 - DOCKER=docker - TRAVIS_TIMEOUT=240 - secure: LIS2XpZufWTcJ53jiRsSZy2Gi1EUJ1XmLg7z3f2ZHeMnyG2Jhk3GW4vod1FNru+PY4PWgddLdCdIl+jqOYXndFlbdAWF3/Oy5fEkYLXdYV7tdlHcPWDkqNFrfiyZ4guChN+b2Nk6FqU7o5fsZAIR7VAbgqNRF5XMo9Mhn/vhDCQRcnbXy7uq7JTrYUkqDbQoyYvT6b480GCY5gags1zp/xZfPDNZEe936o8i5IPTyiykRyNOXN/AH6kd3pR5e1xYgcvJ9KpSVPghcwFE7kJ4fOVMRhRG5ML+IyML+xD0jX43EMNoqRKZ/HS42kIMCInFbJEcxVde7DPNBZ7Y3GAqh7HO6qrE70Dn3ha6DID6zCoH2ArW39BxG4zempjn2VxYoMRGREyZszWQb++dwGoHmo5FHt6zvIrYBG0dA0H8ja9VkZkjFwtYTGHU1ooPzUfJK4O4VBayV8LqZibyZQR+GrmyQc0aagUY7J/fe4A2PJyI4DbkeZ7GX1ELj0ciDz4urQSzUc8l/T3aU3X+FuJItjgYtMLPmqcjA5uifDCtutE8Z9L2gSpanqUdvLSOozuxPho/KNl+2YlF7fXqPW3LnRf5mHD+NbOff306pvKlHJOb2Vmth+HBQ1XDzt/Cy5+sfwS3E0Vmh6UTq/NtkUXxwH10BDMF7FMVlQ4zdHQvyZ0= diff --git a/Makefile b/Makefile index 382d0bdb96..2f22a653a6 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ BUILDTAGS= TAG?=0.13.0 REGISTRY?=quay.io/kubernetes-ingress-controller GOOS?=linux -DOCKER?=gcloud docker -- +DOCKER?=docker SED_I?=sed -i GOHOSTOS ?= $(shell go env GOHOSTOS) @@ -50,7 +50,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) # Set default base image dynamically for each arch -BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.41 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.43 ifeq ($(ARCH),arm) QEMUARCH=arm