Skip to content

Commit bd779a0

Browse files
trdoyle81trdoyle81
authored
Merge branch 'master' into GITOPS-7204-Port-1-092_validate_workload_status_monitoring_alert
2 parents 89e1c26 + 9a57715 commit bd779a0

23 files changed

Lines changed: 1868 additions & 62 deletions

‎.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: openshift-gitops-go-toolset
33
namespace: ci
4-
tag: 1.25.5
4+
tag: 1.25.5

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
271271
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
272272
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=true -f -
273273

274-
275274
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
276275
.PHONY: controller-gen
277276
controller-gen: ## Download controller-gen locally if necessary.

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 81 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,6 +1900,18 @@ spec:
19001900
- name
19011901
type: object
19021902
type: array
1903+
networkPolicy:
1904+
description: NetworkPolicy controls whether the operator should create
1905+
NetworkPolicy resources for this Argo CD instance.
1906+
properties:
1907+
enabled:
1908+
default: true
1909+
description: |-
1910+
Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance.
1911+
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
1912+
When disabled, the operator will remove any previously-created NetworkPolicies.
1913+
type: boolean
1914+
type: object
19031915
nodePlacement:
19041916
description: NodePlacement defines NodeSelectors and Taints for Argo
19051917
CD workloads
@@ -2221,15 +2233,20 @@ spec:
22212233
ArgoCD.
22222234
properties:
22232235
enabled:
2224-
description: Enabled will toggle Prometheus support globally for
2225-
ArgoCD.
2236+
description: |-
2237+
Enabled will toggle Prometheus support globally for ArgoCD.
2238+
When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics.
2239+
The Prometheus CR, Route, and Ingress are deprecated and will no longer be created.
22262240
type: boolean
22272241
host:
2228-
description: Host is the hostname to use for Ingress/Route resources.
2242+
description: |-
2243+
Host is the hostname to use for Ingress/Route resources.
2244+
Deprecated: This field is no longer used and will be ignored.
22292245
type: string
22302246
ingress:
2231-
description: Ingress defines the desired state for an Ingress
2232-
for the Prometheus component.
2247+
description: |-
2248+
Ingress defines the desired state for an Ingress for the Prometheus component.
2249+
Deprecated: This field is no longer used and will be ignored.
22332250
properties:
22342251
annotations:
22352252
additionalProperties:
@@ -2281,8 +2298,9 @@ spec:
22812298
- enabled
22822299
type: object
22832300
route:
2284-
description: Route defines the desired state for an OpenShift
2285-
Route for the Prometheus component.
2301+
description: |-
2302+
Route defines the desired state for an OpenShift Route for the Prometheus component.
2303+
Deprecated: This field is no longer used and will be ignored.
22862304
properties:
22872305
annotations:
22882306
additionalProperties:
@@ -2388,7 +2406,9 @@ spec:
23882406
- enabled
23892407
type: object
23902408
size:
2391-
description: Size is the replica count for the Prometheus StatefulSet.
2409+
description: |-
2410+
Size is the replica count for the Prometheus StatefulSet.
2411+
Deprecated: This field is no longer used and will be ignored.
23922412
format: int32
23932413
type: integer
23942414
required:
@@ -11338,6 +11358,13 @@ spec:
1133811358
description: Agent defines configurations for the Agent component
1133911359
of Argo CD Agent.
1134011360
properties:
11361+
allowedNamespaces:
11362+
description: |-
11363+
AllowedNamespaces is a list of additional namespaces the agent is allowed to
11364+
manage applications in. Supports glob patterns.
11365+
items:
11366+
type: string
11367+
type: array
1134111368
client:
1134211369
description: Client defines the client options for the Agent
1134311370
component.
@@ -11372,6 +11399,20 @@ spec:
1137211399
description: Creds is the credential identifier for the agent
1137311400
authentication
1137411401
type: string
11402+
destinationBasedMapping:
11403+
description: DestinationBasedMapping defines the options for
11404+
destination based mapping for the Agent component.
11405+
properties:
11406+
createNamespace:
11407+
description: |-
11408+
CreateNamespace enables automatic creation of target namespaces on the managed cluster
11409+
when destination-based mapping is enabled.
11410+
type: boolean
11411+
enabled:
11412+
description: Enabled is the flag to enable destination
11413+
based mapping for the Agent component.
11414+
type: boolean
11415+
type: object
1137511416
enabled:
1137611417
description: Enabled is the flag to enable the Agent component
1137711418
during Argo CD installation. (optional, default `false`)
@@ -11580,6 +11621,10 @@ spec:
1158011621
description: Auth is the authentication method for the Principal
1158111622
component.
1158211623
type: string
11624+
destinationBasedMapping:
11625+
description: DestinationBasedMapping is the flag to enable
11626+
destination based mapping for the Principal component.
11627+
type: boolean
1158311628
enabled:
1158411629
description: Enabled is the flag to enable the Principal component
1158511630
during Argo CD installation. (optional, default `false`)
@@ -17981,6 +18026,18 @@ spec:
1798118026
- name
1798218027
type: object
1798318028
type: array
18029+
networkPolicy:
18030+
description: NetworkPolicy controls whether the operator should create
18031+
NetworkPolicy resources for this Argo CD instance.
18032+
properties:
18033+
enabled:
18034+
default: true
18035+
description: |-
18036+
Enabled defines whether NetworkPolicy resources are created for this Argo CD instance.
18037+
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
18038+
When disabled, the operator will remove any previously-created NetworkPolicies.
18039+
type: boolean
18040+
type: object
1798418041
nodePlacement:
1798518042
description: NodePlacement defines NodeSelectors and Taints for Argo
1798618043
CD workloads
@@ -18302,15 +18359,20 @@ spec:
1830218359
ArgoCD.
1830318360
properties:
1830418361
enabled:
18305-
description: Enabled will toggle Prometheus support globally for
18306-
ArgoCD.
18362+
description: |-
18363+
Enabled will toggle Prometheus support globally for ArgoCD.
18364+
When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics.
18365+
The Prometheus CR, Route, and Ingress are deprecated and will no longer be created.
1830718366
type: boolean
1830818367
host:
18309-
description: Host is the hostname to use for Ingress/Route resources.
18368+
description: |-
18369+
Host is the hostname to use for Ingress/Route resources.
18370+
Deprecated: This field is no longer used and will be ignored.
1831018371
type: string
1831118372
ingress:
18312-
description: Ingress defines the desired state for an Ingress
18313-
for the Prometheus component.
18373+
description: |-
18374+
Ingress defines the desired state for an Ingress for the Prometheus component.
18375+
Deprecated: This field is no longer used and will be ignored.
1831418376
properties:
1831518377
annotations:
1831618378
additionalProperties:
@@ -18362,8 +18424,9 @@ spec:
1836218424
- enabled
1836318425
type: object
1836418426
route:
18365-
description: Route defines the desired state for an OpenShift
18366-
Route for the Prometheus component.
18427+
description: |-
18428+
Route defines the desired state for an OpenShift Route for the Prometheus component.
18429+
Deprecated: This field is no longer used and will be ignored.
1836718430
properties:
1836818431
annotations:
1836918432
additionalProperties:
@@ -18469,7 +18532,9 @@ spec:
1846918532
- enabled
1847018533
type: object
1847118534
size:
18472-
description: Size is the replica count for the Prometheus StatefulSet.
18535+
description: |-
18536+
Size is the replica count for the Prometheus StatefulSet.
18537+
Deprecated: This field is no longer used and will be ignored.
1847318538
format: int32
1847418539
type: integer
1847518540
required:

‎bundle/manifests/gitops-operator.clusterserviceversion.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ metadata:
180180
capabilities: Deep Insights
181181
console.openshift.io/plugins: '["gitops-plugin"]'
182182
containerImage: quay.io/redhat-developer/gitops-operator
183-
createdAt: "2026-02-18T10:47:28Z"
183+
createdAt: "2026-02-27T08:17:37Z"
184184
description: Enables teams to adopt GitOps principles for managing cluster configurations
185185
and application delivery across hybrid multi-cluster Kubernetes environments.
186186
features.operators.openshift.io/disconnected: "true"
@@ -574,6 +574,7 @@ spec:
574574
- apiGroups:
575575
- config.openshift.io
576576
resources:
577+
- authentications
577578
- clusterversions
578579
- ingresses
579580
verbs:
@@ -891,7 +892,7 @@ spec:
891892
- --logtostderr=true
892893
- --allow-paths=/metrics
893894
- --http2-disable
894-
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.13
895+
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.15
895896
name: kube-rbac-proxy
896897
ports:
897898
- containerPort: 8443

0 commit comments

Comments
 (0)