From e36fc6ba88e7f7f134a3a2acfde861abf4c6dff6 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Tue, 24 Feb 2026 07:25:26 -0500 Subject: [PATCH 1/2] Update to latest commit of argo-rollouts-manager '1824164aac67c5eb8e331238ec9f602809537ab4' Signed-off-by: Jonathan West --- go.mod | 2 +- go.sum | 4 ++-- scripts/run-rollouts-e2e-tests.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 507bbdb5c..c5bb3828b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator go 1.25.5 require ( - github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce417a + github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67 github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260211145236-4c05ef8fa3d7 github.com/argoproj/argo-cd/v3 v3.3.0 github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d diff --git a/go.sum b/go.sum index 2c068443c..c58be85f2 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce417a h1:USjEzxbs2lZtx7+Hp9u5dYgu7pf/9XnDUSc9+Hmulmo= -github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce417a/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0= +github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67 h1:gFasfvlbOfrwzd7JaVTlnRgE7pDMFC+lQwt07gGGrbY= +github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0= github.com/argoproj-labs/argocd-image-updater v1.1.0 h1:XR+xZf8bDFBaTpVdVpe06t/DPmrIG4BG3HukUXul6X0= github.com/argoproj-labs/argocd-image-updater v1.1.0/go.mod h1:RbPRnEqWBPq1OP29vlZjmfL+/NfonpoagH8SInP/YHc= github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260211145236-4c05ef8fa3d7 h1:SF89hDvomBhku9IjRO60fzeS8ZdwHgmo7KhfTLF4tYo= diff --git a/scripts/run-rollouts-e2e-tests.sh b/scripts/run-rollouts-e2e-tests.sh index c00773c4b..d0bb66b65 100755 --- a/scripts/run-rollouts-e2e-tests.sh +++ b/scripts/run-rollouts-e2e-tests.sh @@ -217,7 +217,7 @@ cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager" # This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh': # - It should always point to the same argo-rollouts-manager commit that is referenced in go.mod of gitops-operator (which will usually be the most recent argo-rollouts-manager commit) -TARGET_ROLLOUT_MANAGER_COMMIT=432c01ce417a25503ce2f57b9e46362bef4b75c7 +TARGET_ROLLOUT_MANAGER_COMMIT=1824164aac67c5eb8e331238ec9f602809537ab4 # This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh': # - It should always point to the same argo-rollouts-manager commit that is referenced in the version of argo-rollouts-manager that is in go.mod From 746b536f93fb368b2dc654e99129d078a95e2d7d Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Tue, 24 Feb 2026 11:56:22 -0500 Subject: [PATCH 2/2] fix: update expected metric plugin configmap name and sha256 value Signed-off-by: Jonathan West --- .../1-112_validate_rollout_plugin_support_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go b/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go index 5e28fb19c..adc3625bb 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-112_validate_rollout_plugin_support_test.go @@ -55,7 +55,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { { Name: "argoproj-labs/sample-prometheus", Location: "https://github.com/argoproj-labs/sample-rollouts-metric-plugin/releases/download/v0.0.4/metric-plugin-linux-amd64", - SHA256: "dac10cbf57633c9832a17f8c27d2ca34aa97dd3d", + SHA256: "af83581a496cebad569c6ddca4e1b7beef1c6f51573d6cd235cebe4390d3a767", }, }, }, @@ -132,10 +132,10 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, } Eventually(rolloutsConfigMap).Should(k8sFixture.ExistByName()) - Eventually(rolloutsConfigMap).Should(configmap.HaveStringDataKeyValue("metricPlugins", ` + Eventually(rolloutsConfigMap).Should(configmap.HaveStringDataKeyValue("metricProviderPlugins", ` - name: argoproj-labs/sample-prometheus location: https://github.com/argoproj-labs/sample-rollouts-metric-plugin/releases/download/v0.0.4/metric-plugin-linux-amd64 - sha256: dac10cbf57633c9832a17f8c27d2ca34aa97dd3d`)) + sha256: af83581a496cebad569c6ddca4e1b7beef1c6f51573d6cd235cebe4390d3a767`)) By("verifying the trafficRouterPlugin contains both gatewayAPI, AND our openshift route plugin")