Skip to content
Open
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions openshift-ci/build-root/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
FROM quay.io/devtools_gitops/go-toolset:1.26.2
USER root

ARG KUSTOMIZE_VERSION=5.7.0
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical | ⚡ Quick win

Version mismatch with e2e test expectations and missing 'v' prefix.

The default version 5.7.0 conflicts with the e2e test requirement in test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go:85-88, which expects v5.8.1. Additionally, the version lacks the v prefix that previous defaults used (e.g., v4.5.7 in hack/non-olm-install/README.md). This format inconsistency may cause the install script to fail.

🔧 Proposed fix
-ARG KUSTOMIZE_VERSION=5.7.0
+ARG KUSTOMIZE_VERSION=v5.8.1
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
ARG KUSTOMIZE_VERSION=5.7.0
ARG KUSTOMIZE_VERSION=v5.8.1
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@openshift-ci/build-root/Dockerfile` at line 6, The ARG KUSTOMIZE_VERSION
default is wrong and missing the leading "v": update the Dockerfile's ARG
KUSTOMIZE_VERSION to the exact version expected by the e2e tests ("v5.8.1") so
the install script uses the matching semver string; ensure the value includes
the "v" prefix and replace the current "5.7.0" token with "v5.8.1" wherever ARG
KUSTOMIZE_VERSION is defined or referenced.

ARG OPERATOR_SDK_VERSION=1.35.0

# Install kubectl tool which is used in e2e-tests
Expand All @@ -14,8 +15,9 @@ RUN curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/relea
chmod +x /usr/local/bin/argocd

# Install Kustomize
RUN wget https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh && \
bash install_kustomize.sh /usr/local/bin && rm install_kustomize.sh
RUN wget -q https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh && \
bash install_kustomize.sh "${KUSTOMIZE_VERSION}" /usr/local/bin && \
rm install_kustomize.sh

# Install operator-sdk
RUN curl -L -o /usr/local/bin/operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v${OPERATOR_SDK_VERSION}/operator-sdk_linux_amd64 && \
Expand Down
Loading