Merge pull request #27 from cybozu-go/update-contour-plus

update controller-runtime

Author: masa213f

Makefile

@@ -11,8 +11,8 @@ export GO111MODULE GOFLAGS
 GOOS = $(shell go env GOOS)
 GOARCH = $(shell go env GOARCH)
 SUDO = sudo
-KUBEBUILDER_VERSION = 2.1.0
-CTRLTOOLS_VERSION = 0.2.2
+KUBEBUILDER_VERSION = 2.2.0
+CTRLTOOLS_VERSION = 0.2.4
 
 all: bin/contour-plus
 

README.md

@@ -15,7 +15,7 @@ Supported environments
 ----------------------
 
 - Kubernetes
-  - 1.14
+  - 1.16
 - Contour
   - 0.12
 - ExternalDNS

go.mod

@@ -2,26 +2,39 @@ module github.com/cybozu-go/contour-plus
 
 go 1.13
 
-replace (
-	k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
-	launchpad.net/gocheck => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
-)
+replace launchpad.net/gocheck => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 
 require (
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/go-logr/logr v0.1.0
-	github.com/jetstack/cert-manager v0.11.0
+	github.com/gogo/protobuf v1.3.1 // indirect
+	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
+	github.com/hashicorp/golang-lru v0.5.3 // indirect
+	github.com/imdario/mergo v0.3.8 // indirect
+	github.com/jetstack/cert-manager v0.12.0
 	github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
 	github.com/kubernetes-incubator/external-dns v0.5.12
-	github.com/onsi/ginkgo v1.8.0
-	github.com/onsi/gomega v1.5.0
+	github.com/onsi/ginkgo v1.10.1
+	github.com/onsi/gomega v1.7.0
 	github.com/projectcontour/contour v1.0.0
+	github.com/prometheus/client_golang v1.2.1 // indirect
+	github.com/prometheus/client_model v0.0.0-20191202183732-d1d2010b5bee // indirect
+	github.com/prometheus/procfs v0.0.8 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.3.2
-	k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
-	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
-	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/klog v0.4.0
-	sigs.k8s.io/controller-runtime v0.3.0
+	go.uber.org/zap v1.10.0 // indirect
+	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
+	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
+	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	gopkg.in/yaml.v2 v2.2.7 // indirect
+	k8s.io/api v0.0.0-20191114100352-16d7abae0d2a
+	k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb
+	k8s.io/client-go v0.0.0-20191114101535-6c5935290e33
+	k8s.io/klog v1.0.0
+	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect
+	sigs.k8s.io/controller-runtime v0.4.0
 )