diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index cc13094..7da6733 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -58,9 +58,6 @@ golangci-lint-1.52-alpine: extends: .build_static_image # Used by gitlab-operator: https://gitlab.com/gitlab-org/cloud-native/gitlab-operator -gitlab-operator-build-base-golang-1.20: - extends: .build_static_image - gitlab-operator-build-base-golang-1.21: extends: .build_static_image diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml index e6e99d9..ee4775c 100644 --- a/.gitlab/ci/gitaly.images.yml +++ b/.gitlab/ci/gitaly.images.yml @@ -19,10 +19,10 @@ gitaly: parallel: matrix: - OS: ['debian:bookworm'] - GOLANG: ['1.20', '1.21', '1.22'] + GOLANG: ['1.21', '1.22'] RUST: ['1.73'] GIT: ['2.36'] - OS: ['ubi:8.6'] - GOLANG: ['1.20', '1.21', '1.22'] + GOLANG: ['1.21', '1.22'] RUST: ['1.73'] GIT: ['2.36'] diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index 454bb9e..1fcfbef 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -100,11 +100,11 @@ gitlab-workhorse: matrix: - OS: ['debian:bookworm'] RUBY: ['3.0', '3.1', '3.2'] - GOLANG: ['1.20', '1.21', '1.22'] + GOLANG: ['1.21', '1.22'] RUST: ['1.73'] GIT: ['2.36'] - OS: ['ubi:8.6'] RUBY: ['3.0', '3.1', '3.2'] - GOLANG: ['1.20', '1.21', '1.22'] + GOLANG: ['1.21', '1.22'] RUST: ['1.73'] GIT: ['2.36'] diff --git a/Dockerfile.gitlab-operator-build-base-golang-1.20 b/Dockerfile.gitlab-operator-build-base-golang-1.20 deleted file mode 100644 index f6f08b5..0000000 --- a/Dockerfile.gitlab-operator-build-base-golang-1.20 +++ /dev/null @@ -1,115 +0,0 @@ -ARG GOLANG_VERSION=1.20 -ARG ALPINE_VERSION=3.18 -ARG OPM_ALPINE_VERSION=3.18 - -## Opm - -FROM golang:${GOLANG_VERSION}-alpine${OPM_ALPINE_VERSION} as opm - -ARG OPM_VERSION=1.19.1 -ENV GOPROXY="https://proxy.golang.org/" - -RUN apk add --no-cache make gcc musl-dev curl git bash - -## on Alpine opm needs to be built from scratch due to glibc vs musl issues -RUN mkdir -p /src \ - && curl -s -L -o /src/operator-registry-${OPM_VERSION}.tgz https://github.com/operator-framework/operator-registry/archive/refs/tags/v${OPM_VERSION}.tar.gz \ - && cd /src \ - && tar -xzf operator-registry-${OPM_VERSION}.tgz \ - && ln -s operator-registry-${OPM_VERSION} operator-registry \ - && cd operator-registry \ - && make bin/opm - -## Kustomize -FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as kustomize - -ARG KUSTOMIZE_VERSION=4.5.7 -ENV GOPROXY="https://proxy.golang.org/" - -RUN apk add --no-cache gcc musl-dev -RUN go install sigs.k8s.io/kustomize/kustomize/v4@v${KUSTOMIZE_VERSION} - -## Controller-gen -FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen - -ARG CONTROLLER_GEN_VERSION=0.7.0 -ENV GOPROXY="https://proxy.golang.org/" - -RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION} - -## Build -FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build - -LABEL maintainer="GitLab Distribution Team" \ - description="Build base image for the GitLab Operator project." - -ARG KUBERNETES_VERSION=1.23.1 -ARG KUBEBUILDER_VERSION=3.12.0 -ARG YQ_VERSION=4.7.0 -ARG HELM_VERSION=3.9.4 -ARG OPERATORSDK_VERSION=1.32.0 -ARG TASK_VERSION=3.12.1 -ENV VCLUSTER_VERSION=0.16.3 -# ARG OPM_VERSION=1.19.0 - -RUN apk add --no-cache podman buildah curl make gcc musl-dev git bash coreutils - -# make VFS podman's default storage driver to -# accomodate running podman within docker -RUN sed -i 's#^driver.*$#driver = "vfs"#g' /etc/containers/storage.conf - -ARG GINKGO_V2_VERSION=2.9.5 -RUN go install github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_V2_VERSION} \ - && ln -s "${GOPATH}/bin/ginkgo" "${GOPATH}/bin/ginkgo2" - -RUN go install golang.org/x/lint/golint@latest - -# 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 -RUN curl --retry 6 -LsO https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 \ - && chmod +x yq_linux_amd64 \ - && mv yq_linux_amd64 /usr/local/bin/yq - -# Helm -RUN curl --retry 6 -Ls "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar -xz -C /tmp/ \ - && chmod +x /tmp/linux-amd64/helm \ - && mv /tmp/linux-amd64/helm /usr/local/bin/helm - -# Opm -COPY --from=opm /src/operator-registry/bin/opm /usr/local/bin/opm - -# vcluster -RUN curl -L -o /usr/local/bin/vcluster \ - https://github.com/loft-sh/vcluster/releases/download/v${VCLUSTER_VERSION}/vcluster-linux-amd64 \ - && chmod +x /usr/local/bin/vcluster - -# Operator-SDK -RUN curl -o /usr/local/bin/operator-sdk_linux_amd64 -L \ - https://github.com/operator-framework/operator-sdk/releases/download/v${OPERATORSDK_VERSION}/operator-sdk_linux_amd64 \ - ; chmod +x /usr/local/bin/operator-sdk_linux_amd64 ; ln -s /usr/local/bin/operator-sdk_linux_amd64 /usr/local/bin/operator-sdk - -# Kustomize -COPY --from=kustomize /go/bin/kustomize /usr/local/bin/kustomize -# Controller-gen -COPY --from=controller-gen /go/bin/controller-gen /usr/local/bin/controller-gen - -# Task -RUN curl --retry 6 -Ls https://github.com/go-task/task/releases/download/v${TASK_VERSION}/task_linux_amd64.tar.gz | tar -xz -C /tmp/ \ - && chmod +x /tmp/task \ - && mv /tmp/task /usr/local/bin/task - -# Clean up temporary installation files -RUN rm -rf /tmp/* - -## Final image -FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} -LABEL maintainer="GitLab Distribution Team" \ - description="Build base image for the GitLab Operator project." -COPY --from=build / / diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 1358a75..2267ca1 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -41,12 +41,6 @@ function print_golang_args() { # NOTE: See https://gitlab.com/gitlab-org/gitlab-build-images#note-regarding-golang-and-fips # when adding a new major/minor Golang version. case "$1" in - 1.20) - INSTALL_GOLANG_VERSION=1.20.14 - INSTALL_GOLANG_FIPS_TAG=1.20.12-1 - GOLANG_DOWNLOAD_SHA256[amd64]="ff445e48af27f93f66bd949ae060d97991c83e11289009d311f25426258f9c44" - GOLANG_DOWNLOAD_SHA256[arm64]="2096507509a98782850d1f0669786c09727053e9fe3c92b03c0d96f48700282b" - ;; 1.21) INSTALL_GOLANG_VERSION=1.21.9 INSTALL_GOLANG_FIPS_TAG=1.21.9-1