Merge pull request #248 from nicksardo/bump-k8s

Re-vendor K8s to ~1.11.0-alpha.2

Gopkg.toml

@@ -22,25 +22,25 @@ ignored = ["k8s.io/kubernetes/pkg/api"]
 
 [[constraint]]
   name = "k8s.io/api"
-  revision = "kubernetes-1.10.0-rc.1"
+  revision = "kubernetes-1.11.0-alpha.2"
 
 # This needs to be an override as it is a non-direct dependency and will not be
 # considered by `dep` as a constraint.
 [[override]]
   name = "k8s.io/apiserver"
-  revision = "kubernetes-1.10.0-rc.1"
+  revision = "kubernetes-1.11.0-alpha.2"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  revision = "kubernetes-1.10.0-rc.1"
+  revision = "kubernetes-1.11.0-alpha.2"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  revision = "kubernetes-1.10.0-rc.1"
+  revision = "kubernetes-1.11.0-alpha.2"
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  revision = "9c40f5b5a622c61c2e37efd37bf136d174d6799a"
+  revision = "33d85b01fe42663de500747def3eaae75cfa0950"
 
 # This needs to be an override as it is a non-direct dependency and will not be
 # considered by `dep` as a constraint.

examples/https/Makefile

@@ -16,17 +16,13 @@ all:
 
 KEY = /tmp/tls.key
 CERT = /tmp/tls.crt
-SECRET = /tmp/tls.json
 HOST=example.com
 NAME=tls-secret
 
 keys:
 	# The CName used here is specific to the service specified in nginx-app.yaml.
 	openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout $(KEY) -out $(CERT) -subj "/CN=$(HOST)/O=$(HOST)"
 
-secret:
-	godep go run make_secret.go -crt $(CERT) -key $(KEY) -name $(NAME) > $(SECRET)
-
 clean:
 	rm $(KEY)
 	rm $(CERT)

examples/https/README.md

@@ -2,8 +2,8 @@
 
 Create secret
 ```console
-$ make keys secret
-$ kubectl create -f /tmp/tls.json
+$ make keys
+$ kubectl create secret tls foo-secret --key /tmp/tls.key --cert /tmp/tls.crt
 ```
 
 Make sure you have the l7 controller running: