Merge pull request #582 from joshbranham/ubi9-wip

SREP-144: Switch to UBI9 and install Go 1.24

Author: openshift-merge-bot[bot]

boilerplate/openshift/golang-osd-e2e/update

@@ -21,9 +21,9 @@ OPERATOR_NAME_CAMEL_CASE=${OPERATOR_PROPER_NAME// /}
 
 mkdir -p "${E2E_SUITE_DIRECTORY}"
 
-E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
+E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
 if [[ -n ${KONFLUX_BUILDS} ]]; then
-	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23"
+	E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24"
 fi
 
 echo "syncing ${E2E_SUITE_DIRECTORY}/Dockerfile"
@@ -109,4 +109,4 @@ sed -e "s/\${OPERATOR_NAME}/${OPERATOR_NAME}/" $(dirname $0)/e2e-template.yml >"
 # todo: remove after file is renamed in ALL consumer repos
 if [ -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml" ]; then
   rm -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml"
-fi
+fi

boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry

@@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
 RUN initializer --permissive
 
 # ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 
 COPY --from=builder /bin/registry-server /bin/registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe

config/Dockerfile

@@ -1,5 +1,5 @@
 FROM quay.io/konflux-ci/yq:latest AS yq
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23 AS builder
+FROM registry.redhat.io/ubi9:9.6-1751445649 AS builder
 
 ARG GOCILINT_VERSION="2.0.2"
 ARG GOCILINT_SHA256SUM="89cc8a7810dc63b9a37900da03e37c3601caf46d42265d774e0f1a5d883d53e2"
@@ -19,8 +19,12 @@ RUN curl -L -o gh.tar.gz ${GH_LOCATION} && \
     tar xzf gh.tar.gz gh_${GH_VERSION}_linux_amd64/bin/gh && \
     mv gh_${GH_VERSION}_linux_amd64/bin/gh /usr/local/bin
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23
-ENV GOFLAGS="-mod=mod"
+FROM registry.redhat.io/ubi9:9.6-1751445649
+
+RUN dnf -y install openssh-clients jq skopeo python3-pyyaml git go-toolset rsync && \
+    dnf clean all && \
+    dnf -y autoremove && \
+    rm -rf /var/cache/dnf
 
 ARG KUSTOMIZE_VERSION="v5.6.0" \
     CONTROLLER_GEN_VERSION="v0.16.4" \
@@ -29,6 +33,11 @@ ARG KUSTOMIZE_VERSION="v5.6.0" \
     GOVULNCHECK_VERSION="v1.1.4" \
     MOCKGEN_VERSION="v0.4.0"
 
+# Set GOPATH to a standard location and add it to PATH
+ENV GOPATH=/go
+ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
+ENV GOFLAGS="-mod=mod"
+
 RUN go install sigs.k8s.io/kustomize/kustomize/v5@${KUSTOMIZE_VERSION} && \
     go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION} && \
     go install k8s.io/code-generator/cmd/openapi-gen@${OPENAPI_GEN_VERSION} && \
@@ -42,20 +51,13 @@ RUN go install sigs.k8s.io/kustomize/kustomize/v5@${KUSTOMIZE_VERSION} && \
 # which is what consumes this image in CI.
 # Here we make group permissions match user permissions, since the CI
 # non-root user's gid is 0.
-SHELL ["/bin/bash", "-c"]
 RUN for bit in r x w; do find $(go env GOPATH) -perm -u+${bit} -a ! -perm -g+${bit} -exec chmod g+${bit} '{}' +; done
 
 COPY --from=builder /usr/local/bin/golangci-lint /usr/local/bin
 COPY --from=builder /usr/local/bin/gh /usr/local/bin
 COPY --from=yq /usr/bin/yq /usr/bin/yq
 
-RUN dnf -y install openssh-clients jq skopeo python3-pyyaml && \
-    dnf clean all && \
-    dnf -y autoremove && \
-    rm -rf /var/cach/dnf
-
 COPY LICENSE .
-ENV PATH=$PATH:/go/bin
 
 # In CI, jobs run in this container with a really high UID generated by OCP. This user does
 # not exist, and therefore $HOME defaults to `/` which leads to cache issues with things like `go`.

test/projects/file-generate/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 
 ENV OPERATOR=/usr/local/bin/file-generate \
     USER_UID=1001 \