Skip to content

Bump argo cd 3.4.2#1158

Open
olivergondza wants to merge 9 commits into
redhat-developer:masterfrom
olivergondza:bump-argo-cd-3.4.2
Open

Bump argo cd 3.4.2#1158
olivergondza wants to merge 9 commits into
redhat-developer:masterfrom
olivergondza:bump-argo-cd-3.4.2

Conversation

@olivergondza
Copy link
Copy Markdown
Collaborator

What type of PR is this?

Uncomment only one /kind line, and delete the rest.
For example, > /kind bug would simply become: /kind bug

/kind chore

/kind bug
/kind cleanup
/kind failing-test
/kind enhancement
/kind documentation
/kind code-refactoring

What does this PR do / why we need it:

Have you updated the necessary documentation?

  • [no] Documentation update is required by this PR.
  • [no] Documentation has been updated.

Which issue(s) this PR fixes:

Fixes #?

Test acceptance criteria:

  • [no] Unit Test
  • [no] E2E Test

How to test changes / Special notes to the reviewer:

Signed-off-by: Oliver Gondža <ogondza@gmail.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 25, 2026

@olivergondza: The label(s) kind/chore cannot be applied, because the repository doesn't have them.

Details

In response to this:

What type of PR is this?

Uncomment only one /kind line, and delete the rest.
For example, > /kind bug would simply become: /kind bug

/kind chore

/kind bug
/kind cleanup
/kind failing-test
/kind enhancement
/kind documentation
/kind code-refactoring

What does this PR do / why we need it:

Have you updated the necessary documentation?

  • [no] Documentation update is required by this PR.
  • [no] Documentation has been updated.

Which issue(s) this PR fixes:

Fixes #?

Test acceptance criteria:

  • [no] Unit Test
  • [no] E2E Test

How to test changes / Special notes to the reviewer:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci Bot requested review from svghadi and trdoyle81 May 25, 2026 13:20
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 25, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign wtam2018 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: Oliver Gondža <ogondza@gmail.com>
Comment thread openshift-ci/build-root/Dockerfile Outdated
@varshab1210
Copy link
Copy Markdown
Member

Please change the version in https://github.com/redhat-developer/gitops-operator/blob/master/.ci-operator.yaml as well

Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@olivergondza
Copy link
Copy Markdown
Collaborator Author

/retest

@olivergondza
Copy link
Copy Markdown
Collaborator Author

olivergondza commented May 26, 2026

@varshab1210, any hint what could cause this failures?

WARNING: image platform (linux/amd64) does not match the expected platform (linux/arm64)
STEP 2/8: ENV "BUILD_LOGLEVEL"="0" "CLONEREFS_OPTIONS"="{\"src_root\":\"/go\",\"log\":\"/dev/null\",\"git_user_name\":\"ci-robot\",\"git_user_email\":\"ci-robot@openshift.io\",\"refs\":[{\"org\":\"redhat-developer\",\"repo\":\"gitops-operator\",\"repo_link\":\"https://github.com/redhat-developer/gitops-operator\",\"base_ref\":\"master\",\"base_sha\":\"3b6fb22628b359be0cf967f9c117498ea6e40b57\",\"base_link\":\"https://github.com/redhat-developer/gitops-operator/commit/3b6fb22628b359be0cf967f9c117498ea6e40b57\",\"pulls\":[{\"number\":1158,\"author\":\"olivergondza\",\"sha\":\"5b2ef0b62eb9cb03a2a55b72e616d8a0ad967864\",\"head_ref\":\"bump-argo-cd-3.4.2\",\"link\":\"https://github.com/redhat-developer/gitops-operator/pull/1158\",\"commit_link\":\"https://github.com/redhat-developer/gitops-operator/pull/1158/commits/5b2ef0b62eb9cb03a2a55b72e616d8a0ad967864\",\"author_link\":\"https://github.com/olivergondza\"}]}],\"fail\":true}"
STEP 3/8: ADD ./clonerefs /clonerefs
STEP 4/8: RUN umask 0002 && /clonerefs && find /go/src -type d -not -perm -0775 | xargs --max-procs 10 --max-args 100 --no-run-if-empty chmod g+xw
exec /bin/sh: exec format error

It looks like arch mismatch between the host and the image. I have no idea what is the intended arch of either, nor where is that configured. Thanks

@varshab1210
Copy link
Copy Markdown
Member

@varshab1210, any hint what could cause this failures?

WARNING: image platform (linux/amd64) does not match the expected platform (linux/arm64)
STEP 2/8: ENV "BUILD_LOGLEVEL"="0" "CLONEREFS_OPTIONS"="{\"src_root\":\"/go\",\"log\":\"/dev/null\",\"git_user_name\":\"ci-robot\",\"git_user_email\":\"ci-robot@openshift.io\",\"refs\":[{\"org\":\"redhat-developer\",\"repo\":\"gitops-operator\",\"repo_link\":\"https://github.com/redhat-developer/gitops-operator\",\"base_ref\":\"master\",\"base_sha\":\"3b6fb22628b359be0cf967f9c117498ea6e40b57\",\"base_link\":\"https://github.com/redhat-developer/gitops-operator/commit/3b6fb22628b359be0cf967f9c117498ea6e40b57\",\"pulls\":[{\"number\":1158,\"author\":\"olivergondza\",\"sha\":\"5b2ef0b62eb9cb03a2a55b72e616d8a0ad967864\",\"head_ref\":\"bump-argo-cd-3.4.2\",\"link\":\"https://github.com/redhat-developer/gitops-operator/pull/1158\",\"commit_link\":\"https://github.com/redhat-developer/gitops-operator/pull/1158/commits/5b2ef0b62eb9cb03a2a55b72e616d8a0ad967864\",\"author_link\":\"https://github.com/olivergondza\"}]}],\"fail\":true}"
STEP 3/8: ADD ./clonerefs /clonerefs
STEP 4/8: RUN umask 0002 && /clonerefs && find /go/src -type d -not -perm -0775 | xargs --max-procs 10 --max-args 100 --no-run-if-empty chmod g+xw
exec /bin/sh: exec format error

It looks like arch mismatch between the host and the image. I have no idea what is the intended arch of either, nor where is that configured. Thanks

Taking a look, seems to be related to arch mismatch

@varshab1210
Copy link
Copy Markdown
Member

/retest

@varshab1210
Copy link
Copy Markdown
Member

/test v4.19-images

3 similar comments
@varshab1210
Copy link
Copy Markdown
Member

/test v4.19-images

@varshab1210
Copy link
Copy Markdown
Member

/test v4.19-images

@varshab1210
Copy link
Copy Markdown
Member

/test v4.19-images

@varshab1210
Copy link
Copy Markdown
Member

/test v4.14-images

2 similar comments
@varshab1210
Copy link
Copy Markdown
Member

/test v4.14-images

@olivergondza
Copy link
Copy Markdown
Collaborator Author

/test v4.14-images

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 27, 2026

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Enterprise

Run ID: 92377e9a-35af-4f8e-b91c-689d0bf05ff4

📥 Commits

Reviewing files that changed from the base of the PR and between c1227b6 and 6d8eec1.

⛔ Files ignored due to path filters (1)
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (1)
  • go.mod
🚧 Files skipped from review as they are similar to previous changes (1)
  • go.mod

📝 Walkthrough

Summary by CodeRabbit

  • Chores

    • Upgraded Go toolchain to 1.26.2, bumped CI/build images to 1.26.2, and refreshed project module dependencies and transitive versions
  • Tests

    • Updated test imports to align with relocated package paths
    • Normalized test specs to use pointer-based field assignments and minor test-spec cleanups (no behavioral changes)

Walkthrough

This pull request upgrades the Go toolchain from version 1.25.5 to 1.26.2 across build configurations and dependencies. It refreshes module dependencies via go.mod, migrates test code imports from standalone argoproj/gitops-engine to the argoproj/argo-cd/gitops-engine package path, and adjusts test Application specifications to use pointer-based fields for sync policy configuration.

Changes

Go 1.26 Toolchain and Dependency Upgrade

Layer / File(s) Summary
Build infrastructure: Go version updates
.ci-operator.yaml, Dockerfile, openshift-ci/build-root/Dockerfile
Docker build stages and CI tooling updated from Go 1.25.5 to 1.26.2.
Module dependency refresh in go.mod
go.mod
Go directive bumped to 1.26.2; primary dependencies (Argo CD, ginkgo/v2, gomega, zap) upgraded; indirect dependencies refreshed across go-openapi, Google libraries, OpenTelemetry, oauth2, Kubernetes, and kustomize; gitops-engine replace directive pinned to newer pseudo-version.
Test fixture matcher functions: gitops-engine import migration
test/openshift/e2e/ginkgo/fixture/application/fixture.go
Fixture exports updated to use health and sync/common types from argoproj/argo-cd/gitops-engine instead of standalone argoproj/gitops-engine, affecting HaveOperationStatePhase and HaveHealthStatusCode matcher function signatures.
Test file imports: migration to argo-cd/gitops-engine package path
test/openshift/e2e/ginkgo/parallel/*, test/openshift/e2e/ginkgo/sequential/*
Test imports across parallel and sequential test suites updated to use github.com/argoproj/argo-cd/gitops-engine packages; import blocks reordered for consistency.
Test code: sync policy pointer fields and spec adjustments
test/openshift/e2e/ginkgo/sequential/*
Application specs updated to set SyncPolicy.Automated fields (Prune, SelfHeal) using ptr.To(true) instead of boolean literals; ImageUpdater spec simplified by removing redundant namespace field assignment.

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Description check ❓ Inconclusive The description is a template with minimal information but is marked as /kind chore, which relates to dependency updates; however, no specific details about the changeset are provided. Add a brief description explaining what dependencies are being updated and why, e.g., 'Updates Go from 1.25.5 to 1.26.2 and upgrades Argo CD dependencies across build configs and test files.'
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title 'Bump argo cd 3.4.2' directly matches the main change: upgrading Argo CD and related Go toolchain dependencies across the repository.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with 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.

Inline comments:
In `@Dockerfile`:
- Line 2: The Dockerfile currently pins the base image as "golang:1.26" which is
inconsistent with other build files that use "1.26.2"; update the FROM
instruction (the base image spec) in the Dockerfile to use "golang:1.26.2" so
the container toolchain matches .ci-operator.yaml,
openshift-ci/build-root/Dockerfile and go.mod.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Enterprise

Run ID: ef71326c-9970-4ae3-a9b5-2158d8a121bf

📥 Commits

Reviewing files that changed from the base of the PR and between 3b6fb22 and 8322b40.

⛔ Files ignored due to path filters (1)
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (29)
  • .ci-operator.yaml
  • Dockerfile
  • go.mod
  • openshift-ci/build-root/Dockerfile
  • test/openshift/e2e/ginkgo/fixture/application/fixture.go
  • test/openshift/e2e/ginkgo/parallel/1-008_validate-custom-argocd-namespace_test.go
  • test/openshift/e2e/ginkgo/parallel/1-009_validate-manage-other-namespace_test.go
  • test/openshift/e2e/ginkgo/parallel/1-012_validate-managed-by-chain_test.go
  • test/openshift/e2e/ginkgo/parallel/1-023_validate_repo_server_tls_test.go
  • test/openshift/e2e/ginkgo/parallel/1-025-validate-managed-by-change_test.go
  • test/openshift/e2e/ginkgo/parallel/1-046_validate_application_tracking_test.go
  • test/openshift/e2e/ginkgo/parallel/1-054_validate_deploymentconfig_test.go
  • test/openshift/e2e/ginkgo/parallel/1-058_validate_prometheus_rule_test.go
  • test/openshift/e2e/ginkgo/parallel/1-070_validate_config_management_plugin_test.go
  • test/openshift/e2e/ginkgo/parallel/1-116_annotation-based-tracking_test.go
  • test/openshift/e2e/ginkgo/parallel/1-121_validate_image_updater_test.go
  • test/openshift/e2e/ginkgo/parallel/1-122_validate_user_defined_appproject.go
  • test/openshift/e2e/ginkgo/sequential/1-006_validate_machine_config_test.go
  • test/openshift/e2e/ginkgo/sequential/1-008_validate-4.9CI-Failures_test.go
  • test/openshift/e2e/ginkgo/sequential/1-010_validate-ootb-manage-other-namespace_test.go
  • test/openshift/e2e/ginkgo/sequential/1-027_validate_operand_from_git_test.go
  • test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go
  • test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go
  • test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go
  • test/openshift/e2e/ginkgo/sequential/1-064_validate_tcp_reset_error_test.go
  • test/openshift/e2e/ginkgo/sequential/1-102_validate_handle_terminating_namespaces_test.go
  • test/openshift/e2e/ginkgo/sequential/1-108_alternate_cluster_roles_cluster_scoped_instance_test.go
  • test/openshift/e2e/ginkgo/sequential/1-113_validate_namespacemanagement_test.go
  • test/openshift/e2e/ginkgo/sequential/1-120_repo_server_system_ca_trust.go

Comment thread Dockerfile Outdated
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@svghadi
Copy link
Copy Markdown
Member

svghadi commented May 29, 2026

/retest

…into bump-argo-cd-3.4.2

Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 31, 2026

@olivergondza: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/v4.19-images 6d8eec1 link true /test v4.19-images
ci/prow/v4.14-images 6d8eec1 link true /test v4.14-images
ci/prow/v4.14-e2e 6d8eec1 link false /test v4.14-e2e
ci/prow/v4.14-kuttl-parallel 6d8eec1 link false /test v4.14-kuttl-parallel
ci/prow/v4.14-kuttl-sequential 6d8eec1 link false /test v4.14-kuttl-sequential
ci/prow/v4.19-e2e 6d8eec1 link true /test v4.19-e2e
ci/prow/v4.19-kuttl-sequential 6d8eec1 link true /test v4.19-kuttl-sequential
ci/prow/v4.19-kuttl-parallel 6d8eec1 link true /test v4.19-kuttl-parallel

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants