Skip to content

Commit 0fe3f7c

Browse files
jgwestjgwest
committed
Update
1 parent fa8e5b6 commit 0fe3f7c

15 files changed

+2280
-410
lines changed

‎bundle/manifests/argoproj.io_argocds.yaml

+769-140
Large diffs are not rendered by default.

‎cmd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
argocdcommon "github.com/argoproj-labs/argocd-operator/common"
3737
argocdprovisioner "github.com/argoproj-labs/argocd-operator/controllers/argocd"
3838
notificationsprovisioner "github.com/argoproj-labs/argocd-operator/controllers/notificationsconfiguration"
39-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
4039
appsv1 "github.com/openshift/api/apps/v1"
4140
configv1 "github.com/openshift/api/config/v1"
4241
console "github.com/openshift/api/console/v1"
@@ -45,6 +44,7 @@ import (
4544
templatev1 "github.com/openshift/api/template/v1"
4645
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
4746
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
47+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
4848
crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
4949
"k8s.io/apimachinery/pkg/labels"
5050
"k8s.io/apimachinery/pkg/runtime"

‎config/crd/bases/argoproj.io_applications.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5747,4 +5747,4 @@ status:
57475747
kind: ""
57485748
plural: ""
57495749
conditions: null
5750-
storedVersions: null
5750+
storedVersions: null

‎config/crd/bases/argoproj.io_applicationsets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17458,4 +17458,4 @@ status:
1745817458
kind: ""
1745917459
plural: ""
1746017460
conditions: null
17461-
storedVersions: null
17461+
storedVersions: null

‎config/crd/bases/argoproj.io_argocds.yaml

+770-141
Large diffs are not rendered by default.

‎config/crd/bases/argoproj.io_notificationsconfigurations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ spec:
7777
served: true
7878
storage: true
7979
subresources:
80-
status: {}
80+
status: {}

‎controllers/argocd_metrics_controller.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@ import (
2525
"strings"
2626

2727
argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1"
28-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
2928
"github.com/go-logr/logr"
29+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
3030
corev1 "k8s.io/api/core/v1"
3131
rbacv1 "k8s.io/api/rbac/v1"
3232
"k8s.io/apimachinery/pkg/api/errors"
3333
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/runtime"
3535
"k8s.io/apimachinery/pkg/types"
3636
"k8s.io/apimachinery/pkg/util/intstr"
37+
"k8s.io/utils/ptr"
3738
ctrl "sigs.k8s.io/controller-runtime"
3839
"sigs.k8s.io/controller-runtime/pkg/client"
3940
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -617,7 +618,7 @@ func newPrometheusRule(namespace string) *monitoringv1.PrometheusRule {
617618
Type: intstr.String,
618619
StrVal: expr,
619620
},
620-
For: "5m",
621+
For: ptr.To((monitoringv1.Duration)("5m")),
621622
Labels: map[string]string{
622623
"severity": "warning",
623624
},

‎controllers/argocd_metrics_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"testing"
2525

2626
argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1"
27-
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
27+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
2828
"gotest.tools/assert"
2929
is "gotest.tools/assert/cmp"
3030
corev1 "k8s.io/api/core/v1"

‎go.mod

+45-44
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ toolchain go1.22.5
66

77
require (
88
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250314083117-bb5580b286c5
9-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250407060436-d8bd8635e78c
10-
github.com/coreos/prometheus-operator v0.40.0
9+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250424123011-d0b8ed3882c1
1110
github.com/go-logr/logr v1.4.2
1211
github.com/google/go-cmp v0.6.0
1312
github.com/hashicorp/go-version v1.6.0
1413
github.com/onsi/ginkgo v1.16.5
1514
github.com/onsi/gomega v1.34.0
1615
github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa
1716
github.com/operator-framework/api v0.17.5
17+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
1818
github.com/stretchr/testify v1.10.0
1919
go.uber.org/zap v1.27.0
2020
golang.org/x/mod v0.22.0
@@ -23,27 +23,28 @@ require (
2323
k8s.io/apiextensions-apiserver v0.29.6
2424
k8s.io/apimachinery v0.29.6
2525
k8s.io/client-go v12.0.0+incompatible
26-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
26+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2727
sigs.k8s.io/controller-runtime v0.17.2
2828
sigs.k8s.io/yaml v1.4.0
2929
)
3030

3131
require (
32-
github.com/argoproj/argo-cd/v2 v2.12.3 // indirect
32+
github.com/argoproj/argo-cd/v2 v2.12.10 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
3434
github.com/blang/semver/v4 v4.0.0 // indirect
3535
github.com/cert-manager/cert-manager v1.14.4 // indirect
3636
github.com/cespare/xxhash/v2 v2.3.0 // indirect
37+
github.com/coreos/prometheus-operator v0.40.0 // indirect
3738
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3839
github.com/dlclark/regexp2 v1.11.2 // indirect
39-
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
40+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
4041
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
4142
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4243
github.com/fsnotify/fsnotify v1.7.0 // indirect
4344
github.com/go-logr/zapr v1.3.0 // indirect
44-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
45-
github.com/go-openapi/jsonreference v0.20.4 // indirect
46-
github.com/go-openapi/swag v0.22.9 // indirect
45+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
46+
github.com/go-openapi/jsonreference v0.21.0 // indirect
47+
github.com/go-openapi/swag v0.23.0 // indirect
4748
github.com/gobwas/glob v0.2.3 // indirect
4849
github.com/gogo/protobuf v1.3.2 // indirect
4950
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -60,7 +61,7 @@ require (
6061
github.com/modern-go/reflect2 v1.0.2 // indirect
6162
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6263
github.com/nxadm/tail v1.4.8 // indirect
63-
github.com/openshift/client-go v0.0.0-20240215090359-b71f6f2731f5 // indirect
64+
github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb // indirect
6465
github.com/pkg/errors v0.9.1 // indirect
6566
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6667
github.com/prometheus/client_golang v1.21.0 // indirect
@@ -72,7 +73,7 @@ require (
7273
github.com/spf13/pflag v1.0.5 // indirect
7374
go.uber.org/multierr v1.11.0 // indirect
7475
golang.org/x/crypto v0.31.0 // indirect
75-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
76+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
7677
golang.org/x/net v0.33.0 // indirect
7778
golang.org/x/oauth2 v0.24.0 // indirect
7879
golang.org/x/sys v0.28.0 // indirect
@@ -88,44 +89,44 @@ require (
8889
k8s.io/component-base v0.29.6 // indirect
8990
k8s.io/klog/v2 v2.120.1 // indirect
9091
k8s.io/kube-aggregator v0.29.6 // indirect
91-
k8s.io/kube-openapi v0.0.0-20240227032403-f107216b40e2 // indirect
92+
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
9293
sigs.k8s.io/gateway-api v1.0.0 // indirect
9394
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9495
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
9596
)
9697

9798
replace (
98-
cloud.google.com/go => cloud.google.com/go v0.100.2
99-
github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.4
100-
github.com/onsi/gomega => github.com/onsi/gomega v1.14.0
101-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb
102-
k8s.io/api => k8s.io/api v0.28.3
103-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.3
104-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
105-
k8s.io/apiserver => k8s.io/apiserver v0.28.3
106-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.3
107-
k8s.io/client-go => k8s.io/client-go v0.28.3 // Required by prometheus-operator
108-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.3
109-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.3
110-
k8s.io/code-generator => k8s.io/code-generator v0.28.3
111-
k8s.io/component-base => k8s.io/component-base v0.28.3
112-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.3
113-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.3
114-
k8s.io/cri-api => k8s.io/cri-api v0.28.3
115-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.3
116-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.3
117-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.3
118-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
119-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.3
120-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.3
121-
k8s.io/kubectl => k8s.io/kubectl v0.28.3
122-
k8s.io/kubelet => k8s.io/kubelet v0.28.3
123-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.3
124-
k8s.io/metrics => k8s.io/metrics v0.28.3
125-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.3
126-
k8s.io/node-api => k8s.io/node-api v0.28.3
127-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.3
128-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.3
129-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.3
130-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.3
99+
// https://github.com/golang/go/issues/33546#issuecomment-519656923
100+
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
101+
102+
k8s.io/api => k8s.io/api v0.29.6
103+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.6
104+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.6
105+
k8s.io/apiserver => k8s.io/apiserver v0.29.6
106+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.6
107+
k8s.io/client-go => k8s.io/client-go v0.29.6
108+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.6
109+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.6
110+
k8s.io/code-generator => k8s.io/code-generator v0.29.6
111+
k8s.io/component-base => k8s.io/component-base v0.29.6
112+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.6
113+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.6
114+
k8s.io/cri-api => k8s.io/cri-api v0.29.6
115+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.6
116+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.6
117+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.6
118+
k8s.io/kms => k8s.io/kms v0.29.6
119+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.6
120+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.6
121+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.6
122+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.6
123+
k8s.io/kubectl => k8s.io/kubectl v0.29.6
124+
k8s.io/kubelet => k8s.io/kubelet v0.29.6
125+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.6
126+
k8s.io/metrics => k8s.io/metrics v0.29.6
127+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.6
128+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.6
129+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.6
130+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.6
131+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.6
131132
)

0 commit comments

Comments
 (0)