Kube 1.16.1

atlassian · Oct 5, 2019 · 75b2f31 · 75b2f31
1 parent 36a5d26
commit 75b2f31
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 97 deletions.
diff --git a/Makefile b/Makefile
@@ -3,8 +3,7 @@ BINARY_PREFIX_DIRECTORY := $(OS)_amd64_stripped
 KUBECONTEXT ?= kubernetes-admin@kind
 KUBECONFIG ?= $(shell kind get kubeconfig-path)
 #KUBECONFIG ?= $$HOME/.kube/config
-KUBE="kubernetes-1.15.2"
-CLIENT="v12.0.0"
+KUBE="kubernetes-1.16.1"
 
 .PHONY: setup-dev
 setup-dev: setup-ci
@@ -17,7 +16,7 @@ setup-base:
 	go mod vendor
 
 # to update kubernetes version:
-# 1. copy https://github.com/kubernetes/kubernetes/blob/v1.15.1/go.mod "require" section into go.mod
+# 1. copy https://github.com/kubernetes/kubernetes/blob/v1.16.1/go.mod "require" section into go.mod
 # 2. remove all v0.0.0 k8s.io/* statements
 # 3. run this command
 .PHONY: update-kube
@@ -30,11 +29,11 @@ update-kube:
 		k8s.io/apimachinery@$(KUBE) \
 		k8s.io/apiserver@$(KUBE) \
 		k8s.io/apiextensions-apiserver@$(KUBE) \
-		k8s.io/client-go@$(CLIENT) \
+		k8s.io/client-go@$(KUBE) \
 		k8s.io/code-generator/cmd/deepcopy-gen@$(KUBE) \
 		k8s.io/code-generator/cmd/client-gen@$(KUBE) \
 		github.com/stretchr/testify@v1.3.0 \
-		github.com/kubernetes-sigs/service-catalog@b7d2813feb2da17aef5db65e9c3d5c356d634a4d \
+		github.com/kubernetes-sigs/service-catalog@master \
 		github.com/atlassian/ctrl@master
 	go mod tidy
 	go mod vendor

diff --git a/examples/sleeper/client.go b/examples/sleeper/client.go
@@ -29,7 +29,7 @@ func Client(cfg *rest.Config) (*rest.RESTClient, error) {
 	config.GroupVersion = &sleeper_v1.SchemeGroupVersion
 	config.APIPath = "/apis"
 	config.ContentType = runtime.ContentTypeJSON
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)}
+	config.NegotiatedSerializer = serializer.NewCodecFactory(scheme).WithoutConversion()
 
 	return rest.RESTClientFor(&config)
 }

diff --git a/go.mod b/go.mod
@@ -1,22 +1,31 @@
 module github.com/atlassian/smith
 
-go 1.12
+go 1.13.1
 
 require (
 	github.com/ash2k/stager v0.0.0-20170622123058-6e9c7b0eacd4
-	github.com/atlassian/ctrl v0.0.0-20190805122149-7c92c5ee8607
-	github.com/kubernetes-sigs/service-catalog v0.2.2-0.20190802222552-b7d2813feb2d
-	github.com/pkg/errors v0.8.0
-	github.com/prometheus/client_golang v0.9.2
+	github.com/atlassian/ctrl v0.0.0-20190816021437-9632032e4bf6
+	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
+	github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
+	github.com/googleapis/gnostic v0.3.1 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/kubernetes-sigs/service-catalog v0.3.0-beta.1
+	github.com/pkg/errors v0.8.1
+	github.com/prometheus/client_golang v0.9.4
 	github.com/stretchr/testify v1.3.0
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.1.0
 	go.uber.org/zap v1.10.0
-	k8s.io/api v0.0.0-20190808180749-077ce48e77da
-	k8s.io/apiextensions-apiserver v0.0.0-20190809061809-636e76ffcf57
-	k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010
-	k8s.io/client-go v0.0.0-20190808180953-396a06da3bd7
-	k8s.io/code-generator v0.0.0-20190808180452-d0071a119380
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.2.4 // indirect
+	k8s.io/api v0.0.0-20191003000013-35e20aa79eb8
+	k8s.io/apiextensions-apiserver v0.0.0-20191003002041-49e3d608220c
+	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+	k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e
+	k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85
+	k8s.io/klog v1.0.0 // indirect
+	k8s.io/utils v0.0.0-20190920012459-5008bf6f8cd6 // indirect
+	sigs.k8s.io/controller-runtime v0.2.0-alpha.0 // indirect
 	sigs.k8s.io/yaml v1.1.0
 )