[RHOAIENG-7286] - update GoLang and ubi on Dockerfile.develop.ci (#321)

* [RHOAIENG-7286] - update GoLang and ubi on Dockerfile.develop.ci

Signed-off-by: Spolti <[email protected]>

* update k8s version

Signed-off-by: Spolti <[email protected]>

* update

Signed-off-by: Spolti <[email protected]>

---------

Signed-off-by: Spolti <[email protected]>

Author: spolti

Diff for: Dockerfile.develop.ci

@@ -15,52 +15,9 @@
 ###############################################################################
 # Create the develop, test, and build environment
 ###############################################################################
+ARG GOLANG_VERSION=1.22
+FROM registry.access.redhat.com/ubi9/go-toolset:$GOLANG_VERSION
 
-# TODO: replace the "go_toolset" build stage once ubi8/go-toolset:1.21 is available
-# the go-toolset 1.21 is based on ubi9, we need to update it in the base image as well.
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as go-toolset
-
-# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-# We need TARGETOS and TARGETARCH (not BUILDOS and BUILDARCH) since the developer
-# image should be built for the OS of the developer using it (this is not a "builder image")
-ARG TARGETOS
-ARG TARGETARCH
-
-ARG GOLANG_VERSION=1.21.6
-
-USER root
-
-ENV HOME=/root \
-    PATH=/usr/local/go/bin:$PATH:
-
-WORKDIR /workspace
-
-# install necessary tools that are included in the ubi/go-toolset image that we are temporarily replacing
-RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
-    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install \
-       diffutils \
-       gcc-c++ \
-       make \
-       wget \
-       tar \
-       git \
-       which \
-    && microdnf update --nodocs \
-    && true
-
-# install go
-RUN true \
-    && wget -qO go.tgz "https://golang.org/dl/go${GOLANG_VERSION}.${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" \
-    && tar -C /usr/local -xzf go.tgz \
-    && go version \
-    && rm go.tgz \
-    && true
-
-####################################################################################
-# TODO: replace "go-toolset" build stage with ubi/go-toolset:1.21 once available   #
-#       and swap `microdnf` commands for `dnf`                                     #
-####################################################################################
-FROM go-toolset
 
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 # don't provide "default" values (e.g. 'ARG TARGETARCH=amd64') for non-buildx environments,
@@ -81,14 +38,15 @@ ENV HOME=/go
 WORKDIR /go/src/github.com/opendatahub-io/modelmesh-serving/
 
 # Install build and dev tools
-# NOTE: Require python38 to install pre-commit
+# NOTE: Require python3 to install pre-commit
 RUN --mount=type=cache,target=/root/.cache/dnf:rw \
     dnf install --setopt=cachedir=/root/.cache/dnf -y --nodocs \
        nodejs \
        jq \
-       python38 \
-    && ln -sf /usr/bin/python3 /usr/bin/python \
-    && ln -sf /usr/bin/pip3 /usr/bin/pip \
+       python3.11 \
+       python3.11-pip \
+    && alternatives --install /usr/bin/unversioned-python python /usr/bin/python3.11 1 \
+    && alternatives --install /usr/bin/pip pip /usr/bin/pip3.11 1 \
     && true
 
 # Install pre-commit
@@ -161,7 +119,7 @@ RUN true \
 # Use setup-envtest for kubebuilder to use K8s version 1.23+ for autoscaling/v2 (HPA)
 RUN true \
     && go install sigs.k8s.io/controller-runtime/tools/[email protected] \
-    && setup-envtest use 1.23 \
+    && setup-envtest use 1.26 \
     && true
 
 # For GitHub Action 'lint', work around error "detected dubious ownership in repository at '/workspace'"

Diff for: Makefile

@@ -35,7 +35,7 @@ CONTROLLER_GEN_VERSION ?= "v0.11.4"
 # https://github.com/kubernetes-sigs/controller-runtime/tree/main/tools/setup-envtest
 # install with `go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest`
 # find available versions by running `setup-envtest list`
-KUBERNETES_VERSION ?= 1.23
+KUBERNETES_VERSION ?= 1.26
 
 CRD_OPTIONS ?= "crd:maxDescLen=0"
 
@@ -178,7 +178,7 @@ develop: build.develop
 
 .PHONY: run
 ## Run make target inside developer container (e.g. `make run fmt`)
-run: build.develop
+run:
 	./scripts/develop.sh make $(RUN_ARGS)
 
 .PHONY: push