Upgrade Kubernetes dependencies

Signed-off-by: Yuki Iwai <[email protected]>

Author: tenzen-y

Makefile

@@ -1,3 +1,17 @@
+# Copyright 2023 The Kubeflow Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 BIN_DIR=_output/cmd/bin
 REPO_PATH="github.com/kubeflow/mpi-operator"
 REL_OSARCH="linux/amd64"
@@ -8,22 +22,24 @@ CONTROLLER_VERSION?=v2
 BASE_IMAGE_SSH_PORT?=2222
 IMG_BUILDER=docker
 LD_FLAGS_V2=" \
-    -X '${REPO_PATH}/v2/pkg/version.GitSHA=${GitSHA}' \
-    -X '${REPO_PATH}/v2/pkg/version.Built=${Date}'   \
-    -X '${REPO_PATH}/v2/pkg/version.Version=${RELEASE_VERSION}'"
+    -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
+    -X '${REPO_PATH}/pkg/version.Built=${Date}'   \
+    -X '${REPO_PATH}/pkg/version.Version=${RELEASE_VERSION}'"
 IMAGE_NAME?=mpioperator/mpi-operator
 KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/kubebuilder/bin
-KIND_VERSION=v0.11.1
+KIND_VERSION=v0.17.0
 # This kubectl version supports -k for kustomization.
-KUBECTL_VERSION=v1.21.4
-
+KUBECTL_VERSION=v1.25.5
+ENVTEST_K8S_VERSION=1.25.0
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+GOARCH=$(shell go env GOARCH)
+GOOS=$(shell go env GOOS)
 
-CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
+CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
 
 build: all
 
-all: ${BIN_DIR} fmt tidy lint test mpi-operator.v2
+all: ${BIN_DIR} fmt vet tidy lint test mpi-operator.v2
 
 .PHONY: mpi-operator.v2
 mpi-operator.v2:
@@ -36,10 +52,14 @@ ${BIN_DIR}:
 fmt:
 	go fmt ./...
 
+.PHONY: vet
+vet:
+	go vet ./...
+
 .PHONY: test
-test: export KUBEBUILDER_ASSETS = ${KUBEBUILDER_ASSETS_PATH}
-test: bin/kubebuilder
-	go test -covermode atomic -coverprofile=profile.cov ./...
+test:
+test: bin/envtest
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -covermode atomic -coverprofile=profile.cov ./...
 
 # Only works with CONTROLLER_VERSION=v2
 .PHONY: test_e2e
@@ -54,8 +74,10 @@ dev_manifest:
 
 .PHONY: generate
 generate:
-	go generate ./pkg/... ./cmd/... && \
-	openapi-gen --input-dirs github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubeflow/common/pkg/apis/common/v1 --output-package github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1 --go-header-file hack/boilerplate/boilerplate.go.txt
+	go generate ./pkg/... ./cmd/...
+	hack/update-codegen.sh
+	$(MAKE) crd
+	hack/python-sdk/gen-sdk.sh
 
 .PHONY: clean
 clean:
@@ -80,50 +102,38 @@ test_images:
 tidy:
 	go mod tidy -go 1.19
 
-GOLANGCI_LINT = ./bin/golangci-lint
-bin/golangci-lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.50.1
-
-GOOS := $(shell go env GOOS)
-GOARCH := $(shell go env GOARCH)
-K8S_VERSION := "1.19.2"
-bin/kubebuilder:
-	curl -sSLo envtest-bins.tar.gz "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-${K8S_VERSION}-${GOOS}-${GOARCH}.tar.gz"
-	mkdir -p bin/kubebuilder
-	tar -C bin/kubebuilder --strip-components=1 -zvxf envtest-bins.tar.gz
-	rm envtest-bins.tar.gz
-
-bin/kubectl:
-	mkdir -p bin
-	curl -L -o bin/kubectl https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
-	chmod +x bin/kubectl
-
 .PHONY: lint
 lint: bin/golangci-lint ## Run golangci-lint linter
 	$(GOLANGCI_LINT) run --new-from-rev=origin/master --go 1.19
 
-.PHONY: kind
-kind:
-	go install sigs.k8s.io/kind@${KIND_VERSION}
-
 # Generate CRD
 crd: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=crd
 
+.PHONY: bin
+bin:
+	mkdir -p $(PROJECT_DIR)/bin
+
+GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
+.PHONY: bin/golangci-lint
+bin/golangci-lint: bin
+	@GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/[email protected]
+
+ENVTEST = $(shell pwd)/bin/setup-envtest
+.PHONY: envtest
+bin/envtest: bin ## Download envtest-setup locally if necessary.
+	@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+
+bin/kubectl: bin
+	curl -L -o $(PROJECT_DIR)/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/$(GOOS)/$(GOARCH)/kubectl
+	chmod +x $(PROJECT_DIR)/bin/kubectl
+
+.PHONY: kind
+kind: bin
+	@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/kind@${KIND_VERSION}
+
 # Download controller-gen locally if necessary
 CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
-controller-gen:
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
-
-# go-get-tool will 'go get' any package $2 and install it to $1.
-define go-get-tool
-@[ -f $(1) ] || { \
-set -e ;\
-TMP_DIR=$$(mktemp -d) ;\
-cd $$TMP_DIR ;\
-go mod init tmp ;\
-echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
-rm -rf $$TMP_DIR ;\
-}
-endef
+.PHONY: controller-gen
+controller-gen: bin
+	@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/[email protected]

cmd/mpi-operator/app/server.go

@@ -207,12 +207,12 @@ func Run(opt *options.ServerOption) error {
 		}
 	}()
 
-	rl := &resourcelock.EndpointsLock{
-		EndpointsMeta: metav1.ObjectMeta{
+	rl := &resourcelock.LeaseLock{
+		LeaseMeta: metav1.ObjectMeta{
 			Namespace: opt.LockNamespace,
 			Name:      controllerName,
 		},
-		Client: leaderElectionClientSet.CoreV1(),
+		Client: leaderElectionClientSet.CoordinationV1(),
 		LockConfig: resourcelock.ResourceLockConfig{
 			Identity:      id,
 			EventRecorder: recorder,