Support Kubernetes v1.22

Makefile

@@ -7,6 +7,7 @@ PROTOC_VERSION=3.15.0
 KIND_VERSION=v0.11.1
 HELM_VERSION=3.5.0
 HELM_DOCS_VERSION=1.5.0
+YQ_VERSION=4.14.1
 
 SUDO=sudo
 CURL=curl -Lsf
@@ -89,7 +90,7 @@ manifests: ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefin
 		webhook \
 		paths="./api/...;./controllers;./hook;./driver/k8s;./pkg/..." \
 		output:crd:artifacts:config=config/crd/bases
-	yq eval 'del(.status)' config/crd/bases/topolvm.cybozu.com_logicalvolumes.yaml > charts/topolvm/crds/topolvm.cybozu.com_logicalvolumes.yaml
+	$(BINDIR)/yq eval 'del(.status)' config/crd/bases/topolvm.cybozu.com_logicalvolumes.yaml > charts/topolvm/crds/topolvm.cybozu.com_logicalvolumes.yaml
 
 .PHONY: generate
 generate: $(PROTOBUF_GEN) ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -182,7 +183,9 @@ tools: install-kind ## Install development tools.
 
 	GOBIN=$(BINDIR) go install github.com/norwoodj/helm-docs/cmd/helm-docs@v$(HELM_DOCS_VERSION)
 	curl -L -sS https://get.helm.sh/helm-v$(HELM_VERSION)-linux-amd64.tar.gz \
-	  | tar xvz -C $(BINDIR) --strip-components 1 linux-amd64/helm
+		| tar xvz -C $(BINDIR) --strip-components 1 linux-amd64/helm
+	wget https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 -O $(BINDIR)/yq \
+		&& chmod +x $(BINDIR)/yq
 
 .PHONY: setup
 setup: tools ## Setup local environment.

charts/topolvm/crds/topolvm.cybozu.com_logicalvolumes.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: logicalvolumes.topolvm.cybozu.com
 spec:

config/crd/bases/topolvm.cybozu.com_logicalvolumes.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: logicalvolumes.topolvm.cybozu.com
 spec:

e2e/Makefile

@@ -4,7 +4,7 @@ TEST_SCHEDULER_MANIFEST ?= daemonset
 STORAGE_CAPACITY ?= false
 
 ## Dependency versions
-MINIKUBE_VERSION := v1.22.0
+MINIKUBE_VERSION := v1.23.2
 CERT_MANAGER_VERSION := v1.3.1
 
 BINDIR := $(shell pwd)/bin
@@ -20,7 +20,7 @@ export MINIKUBE_HOME
 
 READ_WRITE_ONCE_POD=false
 ifeq ($(TEST_KUBERNETES_TARGET),current)
-KUBERNETES_VERSION := 1.22.0
+KUBERNETES_VERSION := 1.22.2
 READ_WRITE_ONCE_POD=true
 else ifeq ($(TEST_KUBERNETES_TARGET),prev)
 KUBERNETES_VERSION := 1.21.2
@@ -39,7 +39,7 @@ endif
 KIND_CONFIG="topolvm-cluster.yaml"
 MINIKUBE_FEATURE_GATES=""
 MINIKUBE_SCHEDULER_MANIFEST=kube-scheduler.yaml
-ifeq ($(KUBERNETES_VERSION),1.22.0)
+ifeq ($(KUBERNETES_VERSION),1.22.2)
 KIND_CONFIG="topolvm-cluster-single-writer.yaml"
 MINIKUBE_FEATURE_GATES="ReadWriteOncePod=true"
 MINIKUBE_SCHEDULER_MANIFEST=kube-scheduler-single-writer.yaml

go.mod

@@ -9,24 +9,24 @@ require (
 	github.com/google/go-cmp v0.5.6
 	github.com/kubernetes-csi/csi-test/v4 v4.3.0
 	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.13.0
+	github.com/onsi/gomega v1.15.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.26.0
 	github.com/pseudomuto/protoc-gen-doc v1.4.1
-	github.com/spf13/cobra v1.1.3
-	github.com/spf13/viper v1.7.1
-	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
+	github.com/spf13/cobra v1.2.1
+	github.com/spf13/viper v1.8.1
+	golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
 	google.golang.org/grpc v1.38.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
 	google.golang.org/protobuf v1.26.0
-	k8s.io/api v0.21.1
-	k8s.io/apimachinery v0.21.1
-	k8s.io/client-go v0.21.1
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
 	k8s.io/klog v1.0.0
-	k8s.io/mount-utils v0.21.1
-	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
-	sigs.k8s.io/controller-runtime v0.9.0
-	sigs.k8s.io/controller-tools v0.6.0
+	k8s.io/mount-utils v0.22.2
+	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
+	sigs.k8s.io/controller-runtime v0.10.0
+	sigs.k8s.io/controller-tools v0.7.0
 	sigs.k8s.io/yaml v1.2.0
 )