Update k8s to v1.11.5 and v1.10.11

vendor.conf

@@ -33,10 +33,10 @@ github.com/smartystreets/go-aws-auth          8ef1316913ee4f44bc48c2456e44a5c1c6
 github.com/mcuadros/go-version                6d5863ca60fa6fe914b5fd43ed8533d7567c5b0b
 
 github.com/rancher/rdns-server                bf662911db6acce4d6a85d2878653f68413b9176
-github.com/rancher/types                      0f69ef3864faae2d4328c13a06b242817e4cbec6
+github.com/rancher/types                      5f30d6820903122f2e288fbc4abde1fd4deacf65
 
 
-github.com/rancher/norman                     643868f4a6c4a0803e287d48b111d39988cc19c0
+github.com/rancher/norman                     39d1bb2830de46f8ef2d1d87c6d315fe1676413a
 github.com/rancher/kontainer-engine           2b4ed633b1aa73a109db704264513bfe9210f52b
 github.com/rancher/rke                        bff7e0a2c3b792704020263927fb7d49b55a3017
 

vendor/github.com/rancher/norman/Dockerfile.dapper

@@ -11,7 +11,7 @@ RUN apt-get update && \
 ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
     GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
 
-RUN wget -O - https://storage.googleapis.com/golang/go1.8.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
+RUN wget -O - https://storage.googleapis.com/golang/go1.9.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
     go get github.com/rancher/trash && go get github.com/golang/lint/golint
 
 ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \

vendor/github.com/rancher/types/Dockerfile.dapper

@@ -11,7 +11,7 @@ RUN apt-get update && \
 ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
     GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
 
-RUN wget -O - https://storage.googleapis.com/golang/go1.8.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
+RUN wget -O - https://storage.googleapis.com/golang/go1.9.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
     go get github.com/rancher/trash && \
     go get github.com/golang/lint/golint && \
     go get golang.org/x/tools/cmd/goimports

vendor/github.com/rancher/types/apis/batch/v1/zz_generated_job_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/batch/v1"
+	v1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/batch/v1"
+	v1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/cluster.cattle.io/v3/schema/schema.go

@@ -4,7 +4,7 @@ import (
 	"github.com/rancher/norman/types"
 	m "github.com/rancher/norman/types/mapper"
 	"github.com/rancher/types/factory"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_component_status_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_config_map_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_endpoints_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_event_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_event_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_namespace_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_node_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_node_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

vendor/github.com/rancher/types/apis/core/v1/zz_generated_persistent_volume_claim_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

vendor/github.com/rancher/types/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )