Skip to content

OCPBUGS-78075: Updating csi-attacher-container image to be consistent with ART for 4.22 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openshift-bot wants to merge 1 commit into from
Closed

OCPBUGS-78075: Updating csi-attacher-container image to be consistent with ART for 4.22 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.22
tag: rhel-9-release-golang-1.25-openshift-4.22
Comment on lines 1 to +4
Copy link

@coderabbitai coderabbitai bot Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Description: Verify the build root image tag exists in the OpenShift registry

# Check if the image stream tag exists using oc (if available) or curl the registry API
curl -sL "https://registry.ci.openshift.org/v2/openshift/release/tags/list" 2>/dev/null | jq -r '.tags[]' | grep -E "rhel-9-release-golang-1.25-openshift-4.22" || echo "Could not verify via public API - image availability will be confirmed during CI run"

Repository: openshift/csi-external-attacher

Length of output: 234

🏁 Script executed:

# Find and examine Dockerfile.ocp to verify Go 1.25
fd -t f "Dockerfile.ocp" -o -name "*Dockerfile*"

Repository: openshift/csi-external-attacher

Length of output: 305

🏁 Script executed:

# Search for references to golang versions in the codebase
rg "golang-1\.(24|25)" -i

Repository: openshift/csi-external-attacher

Length of output: 177

🏁 Script executed:

# Check the actual content of .ci-operator.yaml
cat -n .ci-operator.yaml

Repository: openshift/csi-external-attacher

Length of output: 208

🏁 Script executed:

# Check git diff to see what changed in .ci-operator.yaml
git diff HEAD^ .ci-operator.yaml 2>/dev/null || git log -p -1 .ci-operator.yaml | head -50

Repository: openshift/csi-external-attacher

Length of output: 57

🏁 Script executed:

# Search for any 1.24 references in the repository
rg "1\.24" --type yaml --type dockerfile

Repository: openshift/csi-external-attacher

Length of output: 109

🏁 Script executed:

# Search for any 1.24 references without restricting file type
rg "1\.24"

Repository: openshift/csi-external-attacher

Length of output: 7327

🏁 Script executed:

# Check git log for any commits mentioning this file
git log --oneline .ci-operator.yaml 2>/dev/null | head -5

Repository: openshift/csi-external-attacher

Length of output: 306

🏁 Script executed:

# Show the actual commit that updated the .ci-operator.yaml
git show 29504e32:.ci-operator.yaml 2>/dev/null | head -10

Repository: openshift/csi-external-attacher

Length of output: 180

🏁 Script executed:

# Check what the go.mod file currently specifies
head -5 go.mod

Repository: openshift/csi-external-attacher

Length of output: 156

🏁 Script executed:

# Check git log for go.mod changes around the same commit
git log --oneline go.mod | head -10

Repository: openshift/csi-external-attacher

Length of output: 306

🏁 Script executed:

# Check if go.mod was modified in this commit or recent commits
git log -p --all -- go.mod | head -100

Repository: openshift/csi-external-attacher

Length of output: 57

Update go.mod to reflect Go 1.25 toolchain to match CI build image.

The .ci-operator.yaml change to rhel-9-release-golang-1.25-openshift-4.22 aligns with Dockerfile.ocp, but go.mod still declares go 1.24.0 with toolchain go1.24.6. This creates a mismatch: the CI will build with Go 1.25 while the module claims to require Go 1.24. Update go.mod to go 1.25.0 and adjust the toolchain version accordingly to ensure consistency across CI, Dockerfile, and module declarations.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.ci-operator.yaml around lines 1 - 4, Update go.mod to match the CI image by
changing the module's Go version and toolchain: edit go.mod to set the "go"
directive to 1.25 (e.g. `go 1.25` or `go 1.25.0`) and update the toolchain
comment/pragma (the `toolchain` entry or go version comment such as `//
toolchain go1.24.6`) to the corresponding Go 1.25 toolchain (e.g. `go1.25.x`) so
the module declaration and toolchain match the CI image name
`rhel-9-release-golang-1.25-openshift-4.22`. Ensure you update the `go`
directive and the `toolchain` identifier in go.mod (search for the `go` line and
any `toolchain` comment) and run `go mod tidy` to keep dependencies consistent.

2 changes: 1 addition & 1 deletion Dockerfile.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
WORKDIR /go/src/github.com/kubernetes-csi/external-attacher
COPY . .
RUN make build
Expand Down