[pull] master from kubeflow:master

.github/workflows/golangci-lint.yml

@@ -18,6 +18,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.53.3
-          args: --timeout=5m --go=1.20
+          version: v1.57.2
+          args: --timeout=5m
           only-new-issues: true

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-version: ["v1.25.8", "v1.26.3", "v1.27.1"]
+        kubernetes-version: ["v1.27.11", "v1.28.7", "v1.29.2"]
     steps:
     - name: Clone the code
       uses: actions/checkout@v3

Dockerfile

@@ -1,6 +1,4 @@
-# TODO: Once the gcr.io/distroless/base-debian12 is released, we can use `golang:1.20` as a base image.
-# REF: https://github.com/GoogleContainerTools/distroless/issues/1342
-FROM golang:1.20-bullseye AS build
+FROM golang:1.22 AS build
 
 # Set mpi-operator version
 # Defaults to v2
@@ -12,7 +10,7 @@ WORKDIR /go/src/github.com/kubeflow/mpi-operator
 RUN make RELEASE_VERSION=${RELEASE_VERSION} mpi-operator.$VERSION
 RUN ln -s mpi-operator.${VERSION} _output/cmd/bin/mpi-operator
 
-FROM gcr.io/distroless/base-debian11:latest
+FROM gcr.io/distroless/base-debian12:latest
 
 ENV CONTROLLER_VERSION=$VERSION
 COPY --from=build /go/src/github.com/kubeflow/mpi-operator/_output/cmd/bin/* /opt/

Makefile

@@ -17,7 +17,7 @@ REPO_PATH="github.com/kubeflow/mpi-operator"
 REL_OSARCH="linux/amd64"
 GitSHA=$(shell git rev-parse HEAD)
 Date=$(shell date "+%Y-%m-%d %H:%M:%S")
-RELEASE_VERSION?=v0.4.0
+RELEASE_VERSION?=v0.5.0
 CONTROLLER_VERSION?=v2
 BASE_IMAGE_SSH_PORT?=2222
 IMG_BUILDER=docker
@@ -34,8 +34,8 @@ KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/ku
 KIND_VERSION=v0.18.0
 HELM_VERSION=v3.11.2
 # This kubectl version supports -k for kustomization.
-KUBECTL_VERSION=v1.27.4
-ENVTEST_K8S_VERSION=1.27.1
+KUBECTL_VERSION=v1.29.4
+ENVTEST_K8S_VERSION=1.29.3
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 GOARCH=$(shell go env GOARCH)
 GOOS=$(shell go env GOOS)
@@ -118,11 +118,11 @@ test_images:
 
 .PHONY: tidy
 tidy:
-	go mod tidy -go 1.20
+	go mod tidy
 
 .PHONY: lint
 lint: bin/golangci-lint ## Run golangci-lint linter
-	$(GOLANGCI_LINT) run --new-from-rev=origin/master --go 1.20
+	$(GOLANGCI_LINT) run --new-from-rev=origin/master
 
 # Generate deploy/v2beta1/mpi-operator.yaml
 manifest: kustomize crd
@@ -139,7 +139,7 @@ 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/golangci-lint@v1.53.3
+	@GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 .PHONY: envtest
@@ -162,7 +162,7 @@ helm: bin
 CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
 .PHONY: controller-gen
 controller-gen: bin
-	@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.0
+	@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
 
 KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
 .PHONY: kustomize
@@ -197,14 +197,15 @@ scheduler-plugins-chart: scheduler-plugins-crd
 
 .PHONY: volcano-scheduler
 volcano-scheduler:
-	-@GOPATH=/tmp go install volcano.sh/volcano/cmd/scheduler@$(VOLCANO_SCHEDULER_VERSION)
+	rm -rf /tmp/volcano.sh/volcano
+	git clone -b $(VOLCANO_SCHEDULER_VERSION) --depth 1 https://github.com/volcano-sh/volcano /tmp/volcano.sh/volcano
 
 .PHONY: volcano-scheduler-crd
 volcano-scheduler-crd: volcano-scheduler
 	mkdir -p $(PROJECT_DIR)/dep-crds/volcano-scheduler/
-	cp -f /tmp/pkg/mod/volcano.sh/volcano@$(VOLCANO_SCHEDULER_VERSION)/config/crd/volcano/bases/* $(PROJECT_DIR)/dep-crds/volcano-scheduler
+	cp -f /tmp/volcano.sh/volcano/config/crd/volcano/bases/* $(PROJECT_DIR)/dep-crds/volcano-scheduler
 
 .PHONY: volcano-scheduler-deploy
 volcano-scheduler-deploy: volcano-scheduler-crd
 	mkdir -p $(PROJECT_DIR)/dep-manifests/volcano-scheduler/
-	cp -f /tmp/pkg/mod/volcano.sh/volcano@$(VOLCANO_SCHEDULER_VERSION)/installer/volcano-development.yaml $(PROJECT_DIR)/dep-manifests/volcano-scheduler/
+	cp -f /tmp/volcano.sh/volcano/installer/volcano-development.yaml $(PROJECT_DIR)/dep-manifests/volcano-scheduler/

OWNERS

@@ -2,8 +2,8 @@ approvers:
   - alculquicondor
   - rongou
   - terrytangyuan
+  - tenzen-y
 reviewers:
   - carmark
   - gaocegege
-  - tenzen-y
   - zw0610

README.md

@@ -12,13 +12,13 @@ You can deploy the operator with default settings by running the following comma
 - Latest Development Version
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/kubeflow/mpi-operator/master/deploy/v2beta1/mpi-operator.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/kubeflow/mpi-operator/master/deploy/v2beta1/mpi-operator.yaml
 ```
 
 - Release Version
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/kubeflow/mpi-operator/v0.4.0/deploy/v2beta1/mpi-operator.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/kubeflow/mpi-operator/v0.5.0/deploy/v2beta1/mpi-operator.yaml
 ```
 
 Alternatively, follow the [getting started guide](https://www.kubeflow.org/docs/started/getting-started/) to deploy Kubeflow.

RELEASE.md

@@ -1,5 +1,18 @@
 # MPI Operator Releases
 
+## Release v0.5.0
+* Features:
+  * Add support for MPICH (#562, @sheevy)
+  * Field runLauncherAsWorker allows to add the launcher pod into the hostfile as a worker (#612, @kuizhiqing)
+  * Add PodGroup minResources calculation for volcano integration (#566, @lowang-bh)
+* Bug fixes:
+  * Fix panic when using PodGroups and PriorityClasses (#561, @tenzen-y)
+  * Fix installation of mpijob Python module (#579, @vsoch)
+  * Fix hostfile when jobs in different namespaces have the same name (#622, @kuizhiqing)
+* Clean ups:
+  * Upgrade k8s libraries to v1.29 (#633, @tenzen-y)
+  * Fail the mpi-operator binary if access to API is denied (#619, @emsixteeen)
+
 ## Release v0.4.0
 * Breaking changes
   * Removed v1 operator. If you want to use MPIJob v1, you can use the training-operator.