Skip to content

Commit

Permalink
Upgrade golang and controller-gen
Browse files Browse the repository at this point in the history
Signed-off-by: Aldo Culquicondor <acondor@google.com>
Co-authored-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
  • Loading branch information
alculquicondor and tenzen-y committed Apr 17, 2024
1 parent 79a9b37 commit c0cbf30
Show file tree
Hide file tree
Showing 6 changed files with 6,469 additions and 7,948 deletions.
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit c0cbf30

Please sign in to comment.