From 6e544cfc6374db1724c61052edbe7192bf41a1b5 Mon Sep 17 00:00:00 2001 From: Hossein Pursultani Date: Tue, 16 Nov 2021 18:32:53 +1100 Subject: [PATCH] Use Kubebuilder 3.2.0 and Kubernetes 1.22.1 for GitLab Operator build --- Dockerfile.gitlab-operator-build-base | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile.gitlab-operator-build-base b/Dockerfile.gitlab-operator-build-base index 515f1e1..4914929 100644 --- a/Dockerfile.gitlab-operator-build-base +++ b/Dockerfile.gitlab-operator-build-base @@ -36,7 +36,7 @@ RUN mkdir /src && cd /src; \ ## Controller-gen FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen -ARG CONTROLLER_GEN_VERSION=0.3.0 +ARG CONTROLLER_GEN_VERSION=0.7.0 ENV GOPROXY="https://proxy.golang.org/" RUN mkdir /src && cd /src; \ @@ -49,7 +49,8 @@ FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build LABEL maintainer="GitLab Distribution Team" \ description="Build base image for the GitLab Operator project." -ARG KUBEBUILDER_VERSION=2.3.1 +ARG KUBERNETES_VERSION=1.22.1 +ARG KUBEBUILDER_VERSION=3.2.0 ARG YQ_VERSION=4.7.0 ARG HELM_VERSION=3.5.2 ARG OPERATORSDK_VERSION=1.13.1 @@ -66,8 +67,11 @@ RUN go get -u \ golang.org/x/lint/golint # Kubebuilder -RUN curl --retry 6 -Ls https://github.com/kubernetes-sigs/kubebuilder/releases/download/v${KUBEBUILDER_VERSION}/kubebuilder_${KUBEBUILDER_VERSION}_linux_amd64.tar.gz | tar -xz -C /tmp/ \ - && mv /tmp/kubebuilder_${KUBEBUILDER_VERSION}_linux_amd64 /usr/local/kubebuilder \ +RUN mkdir -p /usr/local/kubebuilder/bin \ + && curl --retry 6 -Ls -o /usr/local/kubebuilder/bin/kubebuilder \ + https://github.com/kubernetes-sigs/kubebuilder/releases/download/v${KUBEBUILDER_VERSION}/kubebuilder_linux_amd64 \ + && curl --retry 6 -Ls "https://go.kubebuilder.io/test-tools/${KUBERNETES_VERSION}/linux/amd64" | tar -xz -C /usr/local/kubebuilder --strip-components=1 \ + && chmod +x /usr/local/kubebuilder/bin/* \ && ln -sfv /usr/local/kubebuilder/bin/* /usr/local/bin # Yq