Bump v1.11.0 (#990)

* Bump v1.11.0 * Bump vendor k8s 1.11.0 Also bump json-iterator as required per: kubernetes/kubernetes#65034
kubernetes-retired · Jul 11, 2018 · 6618198 · 6618198
1 parent 8fb9b6b
commit 6618198
Show file tree

Hide file tree

Showing 436 changed files with 18,144 additions and 7,255 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -9,16 +9,16 @@ required = [
 
 [[override]]
 name = "k8s.io/api"
-revision = "kubernetes-1.10.3"
+revision = "kubernetes-1.11.0"
 [[constraint]]
 name = "k8s.io/apiextensions-apiserver"
-revision = "kubernetes-1.10.3"
+revision = "kubernetes-1.11.0"
 [[constraint]]
 name = "k8s.io/apimachinery"
-revision = "kubernetes-1.10.3"
+revision = "kubernetes-1.11.0"
 [[constraint]]
 name = "k8s.io/client-go"
-revision = "kubernetes-1.10.3"
+revision = "kubernetes-1.11.0"
 
 [[constraint]]
 name = "github.com/coreos/etcd"
@@ -52,6 +52,9 @@ revision = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"
 name = "github.com/gogo/protobuf"
 revision = "909568be09de550ed094403c2bf8a261b5bb730a"
 [[override]]
+name = "github.com/google/btree"
+revision = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4"
+[[override]]
 name = "github.com/golang/protobuf"
 revision = "4bd1920723d7b7c925de087aa32e2187708897f7"
 [[override]]
@@ -61,27 +64,33 @@ revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c"
 name = "github.com/googleapis/gnostic"
 version = "v0.1.0"
 [[override]]
+name = "github.com/gregjones/httpcache"
+revision = "9cad4c3443a7200dd6400aef47183728de563a38"
+[[override]]
 name = "github.com/hashicorp/golang-lru"
 revision = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
 [[override]]
-name = "github.com/howeyc/gopass"
-revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-[[override]]
 name = "github.com/imdario/mergo"
 revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"
 [[override]]
 name = "github.com/inconshreveable/mousetrap"
 revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
 [[override]]
 name = "github.com/json-iterator/go"
-version = "1.0.6"
+revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"
 [[override]]
 name = "github.com/modern-go/concurrent"
 revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
 [[override]]
 name = "github.com/modern-go/reflect2"
 revision = "0b92968f4be75033e2089fba355a691ea2e9c5cc"
 [[override]]
+name = "github.com/petar/GoLLRB"
+revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"
+[[override]]
+name = "github.com/peterbourgon/diskv"
+version = "v2.0.1"
+[[override]]
 name = "github.com/spf13/pflag"
 revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
 [[override]]

diff --git a/Makefile b/Makefile
@@ -76,8 +76,8 @@ conformance-%: clean all
 #TODO: curl/sed "vendored" libs is gross - come up with something better
 vendor:
 	@dep ensure -v
-	@curl https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util.go
-	@curl https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util_unix.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util_unix.go
+	@curl https://raw.githubusercontent.com/kubernetes/kubernetes/v1.11.0/pkg/kubelet/util/util.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util.go
+	@curl https://raw.githubusercontent.com/kubernetes/kubernetes/v1.11.0/pkg/kubelet/util/util_unix.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util_unix.go
 	@CGO_ENABLED=1 go build -o _output/bin/license-bill-of-materials ./vendor/github.com/coreos/license-bill-of-materials
 	@./_output/bin/license-bill-of-materials ./cmd/bootkube ./cmd/checkpoint > bill-of-materials.json
 

diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -53,6 +53,15 @@
 			}
 		]
 	},
+	{
+		"project": "github.com/google/btree",
+		"licenses": [
+			{
+				"type": "Apache License 2.0",
+				"confidence": 1
+			}
+		]
+	},
 	{
 		"project": "github.com/google/gofuzz",
 		"licenses": [
@@ -72,20 +81,20 @@
 		]
 	},
 	{
-		"project": "github.com/hashicorp/golang-lru",
+		"project": "github.com/gregjones/httpcache",
 		"licenses": [
 			{
-				"type": "Mozilla Public License 2.0",
-				"confidence": 1
+				"type": "MIT License",
+				"confidence": 0.9891304347826086
 			}
 		]
 	},
 	{
-		"project": "github.com/howeyc/gopass",
+		"project": "github.com/hashicorp/golang-lru",
 		"licenses": [
 			{
-				"type": "ISC License",
-				"confidence": 0.9850746268656716
+				"type": "Mozilla Public License 2.0",
+				"confidence": 1
 			}
 		]
 	},
@@ -143,6 +152,15 @@
 			}
 		]
 	},
+	{
+		"project": "github.com/peterbourgon/diskv",
+		"licenses": [
+			{
+				"type": "MIT License",
+				"confidence": 0.9891304347826086
+			}
+		]
+	},
 	{
 		"project": "github.com/spf13/cobra",
 		"licenses": [

diff --git a/hack/jenkins/scripts/conformance.sh b/hack/jenkins/scripts/conformance.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 export KUBECONFIG="${KUBECONFIG:-"${DIR}/../../quickstart/cluster/auth/kubeconfig"}"
-export KUBERNETES_VERSION="v1.10.3"
+export KUBERNETES_VERSION="v1.11.0"
 
 # Set up kubectl
 curl -L -O -v https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl

diff --git a/hack/multi-node/user-data.sample b/hack/multi-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.10.3
+        Environment=KUBELET_IMAGE_TAG=v1.11.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

diff --git a/hack/quickstart/kubelet.service b/hack/quickstart/kubelet.service
@@ -1,7 +1,7 @@
 [Service]
 EnvironmentFile=-/etc/kubernetes/kubelet.env
 Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.10.3
+Environment=KUBELET_IMAGE_TAG=v1.11.0
 Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

diff --git a/hack/single-node/user-data.sample b/hack/single-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.10.3
+        Environment=KUBELET_IMAGE_TAG=v1.11.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

diff --git a/hack/tests/conformance-test.sh b/hack/tests/conformance-test.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.10.3}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.11.0}
 
 usage() {
     echo "USAGE:"

diff --git a/pkg/asset/images.go b/pkg/asset/images.go
@@ -7,7 +7,7 @@ var DefaultImages = ImageVersions{
 	FlannelCNI:      "quay.io/coreos/flannel-cni:v0.3.0",
 	Calico:          "quay.io/calico/node:v3.0.3",
 	CalicoCNI:       "quay.io/calico/cni:v2.0.0",
-	Hyperkube:       "k8s.gcr.io/hyperkube:v1.10.3",
+	Hyperkube:       "k8s.gcr.io/hyperkube:v1.11.0",
 	KubeDNS:         "k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10",
 	KubeDNSMasq:     "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10",
 	KubeDNSSidecar:  "k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10",

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -169,7 +169,6 @@ spec:
         - --service-account-key-file=/etc/kubernetes/secrets/service-account.pub
         - --service-cluster-ip-range={{ .ServiceCIDR }}
         - --storage-backend=etcd3
-        - --tls-ca-file=/etc/kubernetes/secrets/ca.crt
         - --tls-cert-file=/etc/kubernetes/secrets/apiserver.crt
         - --tls-private-key-file=/etc/kubernetes/secrets/apiserver.key
         env:

diff --git a/pkg/checkpoint/internal/README.md b/pkg/checkpoint/internal/README.md
@@ -1,6 +1,6 @@
 Copied from pkg/kubelet/util to prevent importing kubernetes
 
 ```
-wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util_unix.go
-wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util.go
+wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.11.0/pkg/kubelet/util/util_unix.go
+wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.11.0/pkg/kubelet/util/util.go
 ```