Update to latest argocd-operator commit 'd0b8ed3882c1bdb021e4b399537dede333cb1cfe' and argo-rollouts-manager commit 'a07ef1782da6cd99da6ed58e223136deb90ab4af' (#886)

* Update to latest argocd-operator commit

Signed-off-by: Jonathan West <[email protected]>

* Upgrade to latest argo-rollouts-manager commit

Signed-off-by: Jonathan West <[email protected]>

* Fix failing E2E tests

Signed-off-by: Jonathan West <[email protected]>

---------

Signed-off-by: Jonathan West <[email protected]>

Author: jgwest

bundle/manifests/argoproj.io_argocds.yaml

@@ -36,7 +36,6 @@ import (
 	argocdcommon "github.com/argoproj-labs/argocd-operator/common"
 	argocdprovisioner "github.com/argoproj-labs/argocd-operator/controllers/argocd"
 	notificationsprovisioner "github.com/argoproj-labs/argocd-operator/controllers/notificationsconfiguration"
-	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "github.com/openshift/api/apps/v1"
 	configv1 "github.com/openshift/api/config/v1"
 	console "github.com/openshift/api/console/v1"
@@ -45,6 +44,7 @@ import (
 	templatev1 "github.com/openshift/api/template/v1"
 	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"

cmd/main.go

@@ -5747,4 +5747,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
-  storedVersions: null
+  storedVersions: null

config/crd/bases/argoproj.io_applications.yaml

@@ -17458,4 +17458,4 @@ status:
     kind: ""
     plural: ""
   conditions: null
-  storedVersions: null
+  storedVersions: null

config/crd/bases/argoproj.io_applicationsets.yaml

@@ -77,4 +77,4 @@ spec:
     served: true
     storage: true
     subresources:
-      status: {}
+      status: {}

config/crd/bases/argoproj.io_argocds.yaml

@@ -25,15 +25,16 @@ import (
 	"strings"
 
 	argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/go-logr/logr"
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -617,7 +618,7 @@ func newPrometheusRule(namespace string) *monitoringv1.PrometheusRule {
 							Type:   intstr.String,
 							StrVal: expr,
 						},
-						For: "5m",
+						For: ptr.To((monitoringv1.Duration)("5m")),
 						Labels: map[string]string{
 							"severity": "warning",
 						},

config/crd/bases/argoproj.io_notificationsconfigurations.yaml

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1"
-	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 	corev1 "k8s.io/api/core/v1"
@@ -334,7 +334,7 @@ func TestReconciler_add_prometheus_rule(t *testing.T) {
 		assert.Assert(t, rule.Spec.Groups[0].Rules[0].Annotations["summary"] != "")
 		assert.Assert(t, rule.Spec.Groups[0].Rules[0].Annotations["description"] != "")
 		assert.Assert(t, rule.Spec.Groups[0].Rules[0].Labels["severity"] != "")
-		assert.Equal(t, rule.Spec.Groups[0].Rules[0].For, "5m")
+		assert.Equal(t, string(*rule.Spec.Groups[0].Rules[0].For), "5m")
 		expr := fmt.Sprintf("argocd_app_info{namespace=\"%s\",sync_status=\"OutOfSync\"} > 0", tc.namespace)
 		assert.Equal(t, rule.Spec.Groups[0].Rules[0].Expr.StrVal, expr)
 	}

controllers/argocd_metrics_controller.go

@@ -5,16 +5,16 @@ go 1.22.0
 toolchain go1.22.5
 
 require (
-	github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250314083117-bb5580b286c5
-	github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250407060436-d8bd8635e78c
-	github.com/coreos/prometheus-operator v0.40.0
+	github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250429111039-a07ef1782da6
+	github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250424123011-d0b8ed3882c1
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-version v1.6.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.34.0
 	github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa
 	github.com/operator-framework/api v0.17.5
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/mod v0.22.0
@@ -23,27 +23,27 @@ require (
 	k8s.io/apiextensions-apiserver v0.29.6
 	k8s.io/apimachinery v0.29.6
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/utils v0.0.0-20240102154912-e7106e64919e
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 	sigs.k8s.io/controller-runtime v0.17.2
 	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
-	github.com/argoproj/argo-cd/v2 v2.12.3 // indirect
+	github.com/argoproj/argo-cd/v2 v2.12.10 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cert-manager/cert-manager v1.14.4 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dlclark/regexp2 v1.11.2 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.3 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/jsonreference v0.20.4 // indirect
-	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -60,7 +60,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/openshift/client-go v0.0.0-20240215090359-b71f6f2731f5 // indirect
+	github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.21.0 // indirect
@@ -72,7 +72,7 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.24.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
@@ -88,44 +88,44 @@ require (
 	k8s.io/component-base v0.29.6 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-aggregator v0.29.6 // indirect
-	k8s.io/kube-openapi v0.0.0-20240227032403-f107216b40e2 // indirect
+	k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
 	sigs.k8s.io/gateway-api v1.0.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
 replace (
-	cloud.google.com/go => cloud.google.com/go v0.100.2
-	github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega => github.com/onsi/gomega v1.14.0
-	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb
-	k8s.io/api => k8s.io/api v0.28.3
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.3
-	k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
-	k8s.io/apiserver => k8s.io/apiserver v0.28.3
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.3
-	k8s.io/client-go => k8s.io/client-go v0.28.3 // Required by prometheus-operator
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.3
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.3
-	k8s.io/code-generator => k8s.io/code-generator v0.28.3
-	k8s.io/component-base => k8s.io/component-base v0.28.3
-	k8s.io/component-helpers => k8s.io/component-helpers v0.28.3
-	k8s.io/controller-manager => k8s.io/controller-manager v0.28.3
-	k8s.io/cri-api => k8s.io/cri-api v0.28.3
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.3
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.3
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.3
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.3
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.3
-	k8s.io/kubectl => k8s.io/kubectl v0.28.3
-	k8s.io/kubelet => k8s.io/kubelet v0.28.3
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.3
-	k8s.io/metrics => k8s.io/metrics v0.28.3
-	k8s.io/mount-utils => k8s.io/mount-utils v0.28.3
-	k8s.io/node-api => k8s.io/node-api v0.28.3
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.3
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.3
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.3
-	k8s.io/sample-controller => k8s.io/sample-controller v0.28.3
+	// https://github.com/golang/go/issues/33546#issuecomment-519656923
+	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
+
+	k8s.io/api => k8s.io/api v0.29.6
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.6
+	k8s.io/apimachinery => k8s.io/apimachinery v0.29.6
+	k8s.io/apiserver => k8s.io/apiserver v0.29.6
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.6
+	k8s.io/client-go => k8s.io/client-go v0.29.6
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.6
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.6
+	k8s.io/code-generator => k8s.io/code-generator v0.29.6
+	k8s.io/component-base => k8s.io/component-base v0.29.6
+	k8s.io/component-helpers => k8s.io/component-helpers v0.29.6
+	k8s.io/controller-manager => k8s.io/controller-manager v0.29.6
+	k8s.io/cri-api => k8s.io/cri-api v0.29.6
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.6
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.6
+	k8s.io/endpointslice => k8s.io/endpointslice v0.29.6
+	k8s.io/kms => k8s.io/kms v0.29.6
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.6
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.6
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.6
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.6
+	k8s.io/kubectl => k8s.io/kubectl v0.29.6
+	k8s.io/kubelet => k8s.io/kubelet v0.29.6
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.6
+	k8s.io/metrics => k8s.io/metrics v0.29.6
+	k8s.io/mount-utils => k8s.io/mount-utils v0.29.6
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.6
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.6
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.6
+	k8s.io/sample-controller => k8s.io/sample-controller v0.29.6
 )