Skip to content

OCPBUGS-69998: Updating ose-cloud-network-config-controller-container image to be consistent with ART for 4.22 #196

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

Open
openshift-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-69998: Updating ose-cloud-network-config-controller-container image to be consistent with ART for 4.22 #196

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.21
tag: rhel-9-release-golang-1.24-openshift-4.22
Comment on lines 1 to +4
Copy link

@coderabbitai coderabbitai bot Dec 19, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

# First, let's understand the file structure and see if there are any git diffs available
git ls-files | head -20

Repository: openshift/cloud-network-config-controller

Length of output: 498

🏁 Script executed:

# Check the current content and structure of .ci-operator.yaml
cat -n .ci-operator.yaml 2>/dev/null || echo "File not found at root"

Repository: openshift/cloud-network-config-controller

Length of output: 218

🏁 Script executed:

# Search for .ci-operator.yaml in the repository
fd "ci-operator" --type f

Repository: openshift/cloud-network-config-controller

Length of output: 67

🏁 Script executed:

# Look for Dockerfile to verify alignment claims
fd "Dockerfile" --type f

Repository: openshift/cloud-network-config-controller

Length of output: 95

🏁 Script executed:

# Check git log for recent changes to understand the PR context
git log --oneline -10 2>/dev/null || echo "Git history not available"

Repository: openshift/cloud-network-config-controller

Length of output: 342

🏁 Script executed:

# Search for references to version 4.21 and 4.22 in the codebase
rg "4\.2[12]" --type-list | head -20

Repository: openshift/cloud-network-config-controller

Length of output: 474

🏁 Script executed:

# Let's see the git diff for .ci-operator.yaml to confirm the version change
git diff HEAD~1 HEAD .ci-operator.yaml 2>/dev/null || git show HEAD:.ci-operator.yaml 2>/dev/null

Repository: openshift/cloud-network-config-controller

Length of output: 190

🏁 Script executed:

# Check Dockerfile for golang version references
cat -n Dockerfile

Repository: openshift/cloud-network-config-controller

Length of output: 803

🏁 Script executed:

# Search for 4.21 and 4.22 references more carefully
rg "4\.21|4\.22"

Repository: openshift/cloud-network-config-controller

Length of output: 245

🏁 Script executed:

# Check git diff more broadly to see what files changed
git diff --stat HEAD~1 HEAD 2>/dev/null || echo "Cannot get git diff"

Repository: openshift/cloud-network-config-controller

Length of output: 104

Version bump is consistent with Dockerfile and ART alignment.

The build root image tag update to 4.22 aligns with the Dockerfile references on lines 1 and 7, which both use rhel-9-golang-1.24-openshift-4.22 and ocp/4.22:base-rhel9 respectively. The changes are consistent with the stated ART-driven 4.22 alignment objective per the commit message.

🤖 Prompt for AI Agents 
In .ci-operator.yaml around lines 1 to 4, ensure the build_root_image tag
matches the Dockerfile and ART alignment (Dockerfile uses
rhel-9-golang-1.24-openshift-4.22 and ocp/4.22:base-rhel9); if it already does,
no change is required, otherwise update the tag to
rhel-9-release-golang-1.24-openshift-4.22 to keep CI, Dockerfile, and ART
references consistent.

4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder

WORKDIR /go/src/github.com/openshift/cloud-network-config-controller
COPY . .
RUN make build

FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9

COPY --from=builder /go/src/github.com/openshift/cloud-network-config-controller/_output/bin/cloud-network-config-controller /usr/bin/

Expand Down