Merge pull request #78 from cybozu-go/regular-update-202203-1

Update supported Kubernetes version to 1.23

Makefile

@@ -1,9 +1,9 @@
-CONTROLLER_TOOLS_VERSION = 0.7.0
+CONTROLLER_TOOLS_VERSION = 0.8.0
 KUSTOMIZE_VERSION = 4.5.4
-CERT_MANAGER_VERSION := 1.6.1
-EXTERNAL_DNS_VERSION := 0.10.1
-CONTOUR_VERSION := 1.19.1
-ENVTEST_K8S_VERSION = 1.22.1
+CERT_MANAGER_VERSION := 1.7.2
+EXTERNAL_DNS_VERSION := 0.11.0
+CONTOUR_VERSION := 1.20.1
+ENVTEST_K8S_VERSION = 1.23.3
 
 PROJECT_DIR := $(CURDIR)
 BIN_DIR := $(PROJECT_DIR)/bin

README.md

@@ -14,13 +14,13 @@ Supported environments
 ----------------------
 
 - Kubernetes
-  - 1.22
+  - 1.23
 - Contour
-  - 1.19
+  - 1.20
 - ExternalDNS
-  - 0.10
+  - 0.11
 - cert-manager
-  - 1.6
+  - 1.7
 
 Other versions may or may not work.
 

config/rbac/role.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

go.mod

@@ -2,28 +2,19 @@ module github.com/cybozu-go/contour-plus
 
 go 1.17
 
-// logr v1.0.0 and klog v0.20.0 have breaking changes.
-// controller-runtime v0.10.x does not support the changes. So use old version libraries.
-// Remove these replacements when upgrading controller-runtime to v0.11
-replace (
-	github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
-	github.com/go-logr/zapr => github.com/go-logr/zapr v0.4.0
-	k8s.io/klog/v2 => k8s.io/klog/v2 v2.10.0
-)
-
 require (
-	github.com/go-logr/logr v1.2.1
+	github.com/go-logr/logr v1.2.3
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.17.0
-	github.com/projectcontour/contour v1.19.1
-	github.com/spf13/cobra v1.2.1
-	github.com/spf13/viper v1.9.0
-	k8s.io/api v0.22.4
-	k8s.io/apimachinery v0.22.4
-	k8s.io/client-go v0.22.4
-	k8s.io/klog/v2 v2.30.0
-	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
-	sigs.k8s.io/controller-runtime v0.10.3
+	github.com/onsi/gomega v1.19.0
+	github.com/projectcontour/contour v1.20.1
+	github.com/spf13/cobra v1.4.0
+	github.com/spf13/viper v1.10.1
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
+	k8s.io/klog/v2 v2.60.1
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
+	sigs.k8s.io/controller-runtime v0.11.2
 )
 
 require (
@@ -52,7 +43,7 @@ require (
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_golang v1.11.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
@@ -64,9 +55,9 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
@@ -78,9 +69,10 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/apiextensions-apiserver v0.22.4 // indirect
-	k8s.io/component-base v0.22.4 // indirect
+	k8s.io/apiextensions-apiserver v0.23.5 // indirect
+	k8s.io/component-base v0.23.5 // indirect
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )