From eee53490b40c158088e7c42121f275fd66d97f79 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Wed, 25 Feb 2026 06:52:07 -0500 Subject: [PATCH] chore: update to master branch of argocd-operator Signed-off-by: Jonathan West --- bundle/manifests/argoproj.io_argocds.yaml | 72 ++++++++++++++++++----- config/crd/bases/argoproj.io_argocds.yaml | 72 ++++++++++++++++++----- go.mod | 4 +- go.sum | 8 +-- 4 files changed, 118 insertions(+), 38 deletions(-) diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml index cc781e852..a2fb8f2d6 100644 --- a/bundle/manifests/argoproj.io_argocds.yaml +++ b/bundle/manifests/argoproj.io_argocds.yaml @@ -1900,6 +1900,18 @@ spec: - name type: object type: array + networkPolicy: + description: NetworkPolicy controls whether the operator should create + NetworkPolicy resources for this Argo CD instance. + properties: + enabled: + default: true + description: |- + Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance. + When enabled, the operator will reconcile NetworkPolicies for Argo CD components. + When disabled, the operator will remove any previously-created NetworkPolicies. + type: boolean + type: object nodePlacement: description: NodePlacement defines NodeSelectors and Taints for Argo CD workloads @@ -2221,15 +2233,20 @@ spec: ArgoCD. properties: enabled: - description: Enabled will toggle Prometheus support globally for - ArgoCD. + description: |- + Enabled will toggle Prometheus support globally for ArgoCD. + When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics. + The Prometheus CR, Route, and Ingress are deprecated and will no longer be created. type: boolean host: - description: Host is the hostname to use for Ingress/Route resources. + description: |- + Host is the hostname to use for Ingress/Route resources. + Deprecated: This field is no longer used and will be ignored. type: string ingress: - description: Ingress defines the desired state for an Ingress - for the Prometheus component. + description: |- + Ingress defines the desired state for an Ingress for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -2281,8 +2298,9 @@ spec: - enabled type: object route: - description: Route defines the desired state for an OpenShift - Route for the Prometheus component. + description: |- + Route defines the desired state for an OpenShift Route for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -2388,7 +2406,9 @@ spec: - enabled type: object size: - description: Size is the replica count for the Prometheus StatefulSet. + description: |- + Size is the replica count for the Prometheus StatefulSet. + Deprecated: This field is no longer used and will be ignored. format: int32 type: integer required: @@ -17981,6 +18001,18 @@ spec: - name type: object type: array + networkPolicy: + description: NetworkPolicy controls whether the operator should create + NetworkPolicy resources for this Argo CD instance. + properties: + enabled: + default: true + description: |- + Enabled defines whether NetworkPolicy resources are created for this Argo CD instance. + When enabled, the operator will reconcile NetworkPolicies for Argo CD components. + When disabled, the operator will remove any previously-created NetworkPolicies. + type: boolean + type: object nodePlacement: description: NodePlacement defines NodeSelectors and Taints for Argo CD workloads @@ -18302,15 +18334,20 @@ spec: ArgoCD. properties: enabled: - description: Enabled will toggle Prometheus support globally for - ArgoCD. + description: |- + Enabled will toggle Prometheus support globally for ArgoCD. + When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics. + The Prometheus CR, Route, and Ingress are deprecated and will no longer be created. type: boolean host: - description: Host is the hostname to use for Ingress/Route resources. + description: |- + Host is the hostname to use for Ingress/Route resources. + Deprecated: This field is no longer used and will be ignored. type: string ingress: - description: Ingress defines the desired state for an Ingress - for the Prometheus component. + description: |- + Ingress defines the desired state for an Ingress for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -18362,8 +18399,9 @@ spec: - enabled type: object route: - description: Route defines the desired state for an OpenShift - Route for the Prometheus component. + description: |- + Route defines the desired state for an OpenShift Route for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -18469,7 +18507,9 @@ spec: - enabled type: object size: - description: Size is the replica count for the Prometheus StatefulSet. + description: |- + Size is the replica count for the Prometheus StatefulSet. + Deprecated: This field is no longer used and will be ignored. format: int32 type: integer required: diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml index 46c79dc39..7e451ac1b 100644 --- a/config/crd/bases/argoproj.io_argocds.yaml +++ b/config/crd/bases/argoproj.io_argocds.yaml @@ -1889,6 +1889,18 @@ spec: - name type: object type: array + networkPolicy: + description: NetworkPolicy controls whether the operator should create + NetworkPolicy resources for this Argo CD instance. + properties: + enabled: + default: true + description: |- + Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance. + When enabled, the operator will reconcile NetworkPolicies for Argo CD components. + When disabled, the operator will remove any previously-created NetworkPolicies. + type: boolean + type: object nodePlacement: description: NodePlacement defines NodeSelectors and Taints for Argo CD workloads @@ -2210,15 +2222,20 @@ spec: ArgoCD. properties: enabled: - description: Enabled will toggle Prometheus support globally for - ArgoCD. + description: |- + Enabled will toggle Prometheus support globally for ArgoCD. + When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics. + The Prometheus CR, Route, and Ingress are deprecated and will no longer be created. type: boolean host: - description: Host is the hostname to use for Ingress/Route resources. + description: |- + Host is the hostname to use for Ingress/Route resources. + Deprecated: This field is no longer used and will be ignored. type: string ingress: - description: Ingress defines the desired state for an Ingress - for the Prometheus component. + description: |- + Ingress defines the desired state for an Ingress for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -2270,8 +2287,9 @@ spec: - enabled type: object route: - description: Route defines the desired state for an OpenShift - Route for the Prometheus component. + description: |- + Route defines the desired state for an OpenShift Route for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -2377,7 +2395,9 @@ spec: - enabled type: object size: - description: Size is the replica count for the Prometheus StatefulSet. + description: |- + Size is the replica count for the Prometheus StatefulSet. + Deprecated: This field is no longer used and will be ignored. format: int32 type: integer required: @@ -17970,6 +17990,18 @@ spec: - name type: object type: array + networkPolicy: + description: NetworkPolicy controls whether the operator should create + NetworkPolicy resources for this Argo CD instance. + properties: + enabled: + default: true + description: |- + Enabled defines whether NetworkPolicy resources are created for this Argo CD instance. + When enabled, the operator will reconcile NetworkPolicies for Argo CD components. + When disabled, the operator will remove any previously-created NetworkPolicies. + type: boolean + type: object nodePlacement: description: NodePlacement defines NodeSelectors and Taints for Argo CD workloads @@ -18291,15 +18323,20 @@ spec: ArgoCD. properties: enabled: - description: Enabled will toggle Prometheus support globally for - ArgoCD. + description: |- + Enabled will toggle Prometheus support globally for ArgoCD. + When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics. + The Prometheus CR, Route, and Ingress are deprecated and will no longer be created. type: boolean host: - description: Host is the hostname to use for Ingress/Route resources. + description: |- + Host is the hostname to use for Ingress/Route resources. + Deprecated: This field is no longer used and will be ignored. type: string ingress: - description: Ingress defines the desired state for an Ingress - for the Prometheus component. + description: |- + Ingress defines the desired state for an Ingress for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -18351,8 +18388,9 @@ spec: - enabled type: object route: - description: Route defines the desired state for an OpenShift - Route for the Prometheus component. + description: |- + Route defines the desired state for an OpenShift Route for the Prometheus component. + Deprecated: This field is no longer used and will be ignored. properties: annotations: additionalProperties: @@ -18458,7 +18496,9 @@ spec: - enabled type: object size: - description: Size is the replica count for the Prometheus StatefulSet. + description: |- + Size is the replica count for the Prometheus StatefulSet. + Deprecated: This field is no longer used and will be ignored. format: int32 type: integer required: diff --git a/go.mod b/go.mod index 507bbdb5c..fb03f24ec 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.25.5 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce417a - github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260211145236-4c05ef8fa3d7 + github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225073619-a52ee52d3941 github.com/argoproj/argo-cd/v3 v3.3.0 github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d github.com/go-logr/logr v1.4.3 @@ -43,7 +43,7 @@ require ( github.com/Masterminds/semver/v3 v3.4.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.1.6 // indirect - github.com/argoproj-labs/argocd-image-updater v1.1.0 // indirect + github.com/argoproj-labs/argocd-image-updater v1.1.1 // indirect github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect github.com/argoproj/pkg/v2 v2.0.1 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/go.sum b/go.sum index 2c068443c..f19a36392 100644 --- a/go.sum +++ b/go.sum @@ -37,10 +37,10 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW 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/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= -github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260211145236-4c05ef8fa3d7/go.mod h1:G9rmG9/3gV899eg8wL/4YQYTBSq5M+xEwfVBMuE8RlA= +github.com/argoproj-labs/argocd-image-updater v1.1.1 h1:7YDaR3WX2NMsDKp0wN7TRaRRHaVHQ94tSybi2P99MGk= +github.com/argoproj-labs/argocd-image-updater v1.1.1/go.mod h1:gMHiNrGNwNSt4ljf0ykcnmNvXBk/NJ+Z17AnZVe7V7I= +github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225073619-a52ee52d3941 h1:wkBZFBhSxIpaOfQOwQT44kgwkI/UC7IxM85GJ8w+nHI= +github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225073619-a52ee52d3941/go.mod h1:3/Y9YWMU+DHC+onOQVXPAxrNkoBAGZD+UQui9BgJBjY= github.com/argoproj/argo-cd/v3 v3.3.0 h1:9UlruTd5cC/MyvorTXgAIblfZTy63MF5FYvvoAaUvwU= github.com/argoproj/argo-cd/v3 v3.3.0/go.mod h1:5VAfe0s/a4VY5GmAIFK76FtW6xn7zAcLmaw25bOL/2g= github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d h1:iUJYrbSvpV9n8vyl1sBt1GceM60HhHfnHxuzcm5apDg=