Skip to content

Commit 5d368df

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #656 from jstourac/RHOAIENG-29976
Bump go-toolset images from UBI8 to UBI9 and from golang 1.23 to 1.24
2 parents d6055d9 + 84b07fd commit 5d368df

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎DEPENDENCIES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This guide outlines the steps to upgrade the Go version and dependencies in the
77
Upgrading the Go version should be done in a separate PR to isolate the changes and make review easier.
88

99
> [!IMPORTANT]
10-
> Images are to be built in the [ubi8/go-toolset](https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1) container.
10+
> Images are to be built in the [ubi9/go-toolset](https://catalog.redhat.com/software/containers/ubi9/go-toolset/61e5c00b4ec9945c18787690) container.
1111
> It contains a customized FIPS-compatible version of Go, that however lags behind the latest upstream Go version.
1212
> Always use a Go version that has a supporting go-toolset image available.
1313
@@ -32,7 +32,7 @@ Upgrading the Go version should be done in a separate PR to isolate the changes
3232
5. After merging the Go upgrade PR, update the fork at https://github.com/red-hat-data-services/kubeflow:
3333
- Locate all `Dockerfile.konflux` files in the repository.
3434
- Update the Go version in each of these files to match the new version.
35-
- Refer to the [ubi8/go-toolset](https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1) in Red Hat image catalog to locate `sha256` hash
35+
- Refer to the [ubi9/go-toolset](https://catalog.redhat.com/software/containers/ubi9/go-toolset/61e5c00b4ec9945c18787690) in Red Hat image catalog to locate `sha256` hash
3636
- Create a pull request in the fork repository with these changes.
3737

3838
6. Review CI/CD configuration files (especially openshift/release OCP-CI yamls) that specify a Go version.

‎components/notebook-controller/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
# Build arguments
99
ARG SOURCE_CODE=.
10-
ARG GOLANG_VERSION=1.23
10+
ARG GOLANG_VERSION=1.24
1111

12-
# Use ubi8/go-toolset as base image
13-
# https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1
12+
# Use ubi9/go-toolset as base image
13+
# https://catalog.redhat.com/software/containers/ubi9/go-toolset/61e5c00b4ec9945c18787690
1414
# image sets GOTOOLCHAIN=local so it won't end up downloading if go.mod requests different version
15-
FROM registry.access.redhat.com/ubi8/go-toolset:${GOLANG_VERSION} as builder
15+
FROM registry.access.redhat.com/ubi9/go-toolset:${GOLANG_VERSION} as builder
1616
ARG TARGETOS
1717
ARG TARGETARCH
1818

@@ -41,8 +41,8 @@ USER root
4141
RUN if [ -z ${CACHITO_ENV_FILE} ]; then go mod download; else source ${CACHITO_ENV_FILE}; fi && \
4242
CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -tags strictfipsruntime -a -o ./bin/manager main.go
4343

44-
# Use ubi8/ubi-minimal as base image
45-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
44+
# Use ubi9/ubi-minimal as base image
45+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
4646

4747
## Install additional packages
4848
RUN microdnf install -y shadow-utils &&\

‎components/notebook-controller/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/kubeflow/kubeflow/components/notebook-controller
22

3-
go 1.23.0
3+
go 1.24
44

5-
toolchain go1.23.6
5+
toolchain go1.24.5
66

77
require (
88
github.com/go-logr/logr v1.4.1

‎components/odh-notebook-controller/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
# Build arguments
99
ARG SOURCE_CODE=.
10-
ARG GOLANG_VERSION=1.23
10+
ARG GOLANG_VERSION=1.24
1111

12-
# Use ubi8/go-toolset as base image
13-
# https://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1
12+
# Use ubi9/go-toolset as base image
13+
# https://catalog.redhat.com/software/containers/ubi9/go-toolset/61e5c00b4ec9945c18787690
1414
# image sets GOTOOLCHAIN=local so it won't end up downloading if go.mod requests different version
15-
FROM registry.access.redhat.com/ubi8/go-toolset:${GOLANG_VERSION} as builder
15+
FROM registry.access.redhat.com/ubi9/go-toolset:${GOLANG_VERSION} as builder
1616
ARG TARGETOS
1717
ARG TARGETARCH
1818

@@ -39,8 +39,8 @@ USER root
3939
RUN if [ -z ${CACHITO_ENV_FILE} ]; then go mod download; else source ${CACHITO_ENV_FILE}; fi && \
4040
CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -tags strictfipsruntime -a -o ./bin/manager main.go
4141

42-
# Use ubi8/ubi-minimal as base image
43-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
42+
# Use ubi9/ubi-minimal as base image
43+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
4444

4545
## Install additional packages
4646
RUN microdnf install -y shadow-utils &&\

‎components/odh-notebook-controller/controllers/notebook_controller_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ var _ = Describe("The Openshift Notebook controller", func() {
469469
key := types.NamespacedName{Name: Name, Namespace: Namespace}
470470
Expect(cli.Get(ctx, key, notebook)).Should(Succeed())
471471

472-
updatedImage := "registry.redhat.io/ubi8/ubi:updated"
472+
updatedImage := "registry.redhat.io/ubi9/ubi:updated"
473473
notebook.Spec.Template.Spec.Containers[0].Image = updatedImage
474474
Expect(cli.Update(ctx, notebook)).Should(Succeed())
475475

@@ -510,7 +510,7 @@ var _ = Describe("The Openshift Notebook controller", func() {
510510
key := types.NamespacedName{Name: Name, Namespace: Namespace}
511511
Expect(cli.Get(ctx, key, notebook)).Should(Succeed())
512512

513-
updatedImage := "registry.redhat.io/ubi8/ubi:updated"
513+
updatedImage := "registry.redhat.io/ubi9/ubi:updated"
514514
notebook.Spec.Template.Spec.Containers[0].Image = updatedImage
515515
Expect(cli.Update(ctx, notebook)).Should(Succeed())
516516

@@ -705,7 +705,7 @@ var _ = Describe("The Openshift Notebook controller", func() {
705705
Spec: corev1.PodSpec{
706706
Containers: []corev1.Container{{
707707
Name: Name,
708-
Image: "registry.redhat.io/ubi8/ubi:latest",
708+
Image: "registry.redhat.io/ubi9/ubi:latest",
709709
}},
710710
Volumes: []corev1.Volume{
711711
{
@@ -742,7 +742,7 @@ var _ = Describe("The Openshift Notebook controller", func() {
742742
Containers: []corev1.Container{
743743
{
744744
Name: Name,
745-
Image: "registry.redhat.io/ubi8/ubi:latest",
745+
Image: "registry.redhat.io/ubi9/ubi:latest",
746746
},
747747
createOAuthContainer(Name, Namespace),
748748
},
@@ -1352,7 +1352,7 @@ func createNotebook(name, namespace string) *nbv1.Notebook {
13521352
Template: nbv1.NotebookTemplateSpec{
13531353
Spec: corev1.PodSpec{Containers: []corev1.Container{{
13541354
Name: name,
1355-
Image: "registry.redhat.io/ubi8/ubi:latest",
1355+
Image: "registry.redhat.io/ubi9/ubi:latest",
13561356
}}}},
13571357
},
13581358
}

‎components/odh-notebook-controller/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/opendatahub-io/kubeflow/components/odh-notebook-controller
22

3-
go 1.23.0
3+
go 1.24
44

5-
toolchain go1.23.6
5+
toolchain go1.24.5
66

77
require (
88
github.com/go-logr/logr v1.4.2

0 commit comments

Comments
 (0)