Skip to content

Commit eec0f8a

Browse files
anandrkskdanandrkskd
authored
downstream creating networkpolicies for argocd components. (#1083)
* downstream networkpolicy Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com> * add netwrok policy for principal component and add tests Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com> --------- Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>
1 parent a39775a commit eec0f8a

8 files changed

Lines changed: 571 additions & 36 deletions

File tree

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 56 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:
@@ -17981,6 +18001,18 @@ spec:
1798118001
- name
1798218002
type: object
1798318003
type: array
18004+
networkPolicy:
18005+
description: NetworkPolicy controls whether the operator should create
18006+
NetworkPolicy resources for this Argo CD instance.
18007+
properties:
18008+
enabled:
18009+
default: true
18010+
description: |-
18011+
Enabled defines whether NetworkPolicy resources are created for this Argo CD instance.
18012+
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
18013+
When disabled, the operator will remove any previously-created NetworkPolicies.
18014+
type: boolean
18015+
type: object
1798418016
nodePlacement:
1798518017
description: NodePlacement defines NodeSelectors and Taints for Argo
1798618018
CD workloads
@@ -18302,15 +18334,20 @@ spec:
1830218334
ArgoCD.
1830318335
properties:
1830418336
enabled:
18305-
description: Enabled will toggle Prometheus support globally for
18306-
ArgoCD.
18337+
description: |-
18338+
Enabled will toggle Prometheus support globally for ArgoCD.
18339+
When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics.
18340+
The Prometheus CR, Route, and Ingress are deprecated and will no longer be created.
1830718341
type: boolean
1830818342
host:
18309-
description: Host is the hostname to use for Ingress/Route resources.
18343+
description: |-
18344+
Host is the hostname to use for Ingress/Route resources.
18345+
Deprecated: This field is no longer used and will be ignored.
1831018346
type: string
1831118347
ingress:
18312-
description: Ingress defines the desired state for an Ingress
18313-
for the Prometheus component.
18348+
description: |-
18349+
Ingress defines the desired state for an Ingress for the Prometheus component.
18350+
Deprecated: This field is no longer used and will be ignored.
1831418351
properties:
1831518352
annotations:
1831618353
additionalProperties:
@@ -18362,8 +18399,9 @@ spec:
1836218399
- enabled
1836318400
type: object
1836418401
route:
18365-
description: Route defines the desired state for an OpenShift
18366-
Route for the Prometheus component.
18402+
description: |-
18403+
Route defines the desired state for an OpenShift Route for the Prometheus component.
18404+
Deprecated: This field is no longer used and will be ignored.
1836718405
properties:
1836818406
annotations:
1836918407
additionalProperties:
@@ -18469,7 +18507,9 @@ spec:
1846918507
- enabled
1847018508
type: object
1847118509
size:
18472-
description: Size is the replica count for the Prometheus StatefulSet.
18510+
description: |-
18511+
Size is the replica count for the Prometheus StatefulSet.
18512+
Deprecated: This field is no longer used and will be ignored.
1847318513
format: int32
1847418514
type: integer
1847518515
required:

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

Lines changed: 1 addition & 1 deletion
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-25T05:56:01Z"
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"

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

Lines changed: 56 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,6 +1889,18 @@ spec:
18891889
- name
18901890
type: object
18911891
type: array
1892+
networkPolicy:
1893+
description: NetworkPolicy controls whether the operator should create
1894+
NetworkPolicy resources for this Argo CD instance.
1895+
properties:
1896+
enabled:
1897+
default: true
1898+
description: |-
1899+
Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance.
1900+
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
1901+
When disabled, the operator will remove any previously-created NetworkPolicies.
1902+
type: boolean
1903+
type: object
18921904
nodePlacement:
18931905
description: NodePlacement defines NodeSelectors and Taints for Argo
18941906
CD workloads
@@ -2210,15 +2222,20 @@ spec:
22102222
ArgoCD.
22112223
properties:
22122224
enabled:
2213-
description: Enabled will toggle Prometheus support globally for
2214-
ArgoCD.
2225+
description: |-
2226+
Enabled will toggle Prometheus support globally for ArgoCD.
2227+
When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics.
2228+
The Prometheus CR, Route, and Ingress are deprecated and will no longer be created.
22152229
type: boolean
22162230
host:
2217-
description: Host is the hostname to use for Ingress/Route resources.
2231+
description: |-
2232+
Host is the hostname to use for Ingress/Route resources.
2233+
Deprecated: This field is no longer used and will be ignored.
22182234
type: string
22192235
ingress:
2220-
description: Ingress defines the desired state for an Ingress
2221-
for the Prometheus component.
2236+
description: |-
2237+
Ingress defines the desired state for an Ingress for the Prometheus component.
2238+
Deprecated: This field is no longer used and will be ignored.
22222239
properties:
22232240
annotations:
22242241
additionalProperties:
@@ -2270,8 +2287,9 @@ spec:
22702287
- enabled
22712288
type: object
22722289
route:
2273-
description: Route defines the desired state for an OpenShift
2274-
Route for the Prometheus component.
2290+
description: |-
2291+
Route defines the desired state for an OpenShift Route for the Prometheus component.
2292+
Deprecated: This field is no longer used and will be ignored.
22752293
properties:
22762294
annotations:
22772295
additionalProperties:
@@ -2377,7 +2395,9 @@ spec:
23772395
- enabled
23782396
type: object
23792397
size:
2380-
description: Size is the replica count for the Prometheus StatefulSet.
2398+
description: |-
2399+
Size is the replica count for the Prometheus StatefulSet.
2400+
Deprecated: This field is no longer used and will be ignored.
23812401
format: int32
23822402
type: integer
23832403
required:
@@ -17970,6 +17990,18 @@ spec:
1797017990
- name
1797117991
type: object
1797217992
type: array
17993+
networkPolicy:
17994+
description: NetworkPolicy controls whether the operator should create
17995+
NetworkPolicy resources for this Argo CD instance.
17996+
properties:
17997+
enabled:
17998+
default: true
17999+
description: |-
18000+
Enabled defines whether NetworkPolicy resources are created for this Argo CD instance.
18001+
When enabled, the operator will reconcile NetworkPolicies for Argo CD components.
18002+
When disabled, the operator will remove any previously-created NetworkPolicies.
18003+
type: boolean
18004+
type: object
1797318005
nodePlacement:
1797418006
description: NodePlacement defines NodeSelectors and Taints for Argo
1797518007
CD workloads
@@ -18291,15 +18323,20 @@ spec:
1829118323
ArgoCD.
1829218324
properties:
1829318325
enabled:
18294-
description: Enabled will toggle Prometheus support globally for
18295-
ArgoCD.
18326+
description: |-
18327+
Enabled will toggle Prometheus support globally for ArgoCD.
18328+
When set to true, ServiceMonitors and PrometheusRules will be created for Argo CD metrics.
18329+
The Prometheus CR, Route, and Ingress are deprecated and will no longer be created.
1829618330
type: boolean
1829718331
host:
18298-
description: Host is the hostname to use for Ingress/Route resources.
18332+
description: |-
18333+
Host is the hostname to use for Ingress/Route resources.
18334+
Deprecated: This field is no longer used and will be ignored.
1829918335
type: string
1830018336
ingress:
18301-
description: Ingress defines the desired state for an Ingress
18302-
for the Prometheus component.
18337+
description: |-
18338+
Ingress defines the desired state for an Ingress for the Prometheus component.
18339+
Deprecated: This field is no longer used and will be ignored.
1830318340
properties:
1830418341
annotations:
1830518342
additionalProperties:
@@ -18351,8 +18388,9 @@ spec:
1835118388
- enabled
1835218389
type: object
1835318390
route:
18354-
description: Route defines the desired state for an OpenShift
18355-
Route for the Prometheus component.
18391+
description: |-
18392+
Route defines the desired state for an OpenShift Route for the Prometheus component.
18393+
Deprecated: This field is no longer used and will be ignored.
1835618394
properties:
1835718395
annotations:
1835818396
additionalProperties:
@@ -18458,7 +18496,9 @@ spec:
1845818496
- enabled
1845918497
type: object
1846018498
size:
18461-
description: Size is the replica count for the Prometheus StatefulSet.
18499+
description: |-
18500+
Size is the replica count for the Prometheus StatefulSet.
18501+
Deprecated: This field is no longer used and will be ignored.
1846218502
format: int32
1846318503
type: integer
1846418504
required:

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.5
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce417a
7-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225073619-a52ee52d3941
7+
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225142026-dabb25d60d94
88
github.com/argoproj/argo-cd/v3 v3.3.0
99
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d
1010
github.com/go-logr/logr v1.4.3

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce4
3939
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260218104514-432c01ce417a/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
4040
github.com/argoproj-labs/argocd-image-updater v1.1.1 h1:7YDaR3WX2NMsDKp0wN7TRaRRHaVHQ94tSybi2P99MGk=
4141
github.com/argoproj-labs/argocd-image-updater v1.1.1/go.mod h1:gMHiNrGNwNSt4ljf0ykcnmNvXBk/NJ+Z17AnZVe7V7I=
42-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225073619-a52ee52d3941 h1:wkBZFBhSxIpaOfQOwQT44kgwkI/UC7IxM85GJ8w+nHI=
43-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225073619-a52ee52d3941/go.mod h1:3/Y9YWMU+DHC+onOQVXPAxrNkoBAGZD+UQui9BgJBjY=
42+
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225142026-dabb25d60d94 h1:1HO3tG4kb0rJ2XD+pjHlSLbZMufBl/fNqGhkf9vkpho=
43+
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260225142026-dabb25d60d94/go.mod h1:3/Y9YWMU+DHC+onOQVXPAxrNkoBAGZD+UQui9BgJBjY=
4444
github.com/argoproj/argo-cd/v3 v3.3.0 h1:9UlruTd5cC/MyvorTXgAIblfZTy63MF5FYvvoAaUvwU=
4545
github.com/argoproj/argo-cd/v3 v3.3.0/go.mod h1:5VAfe0s/a4VY5GmAIFK76FtW6xn7zAcLmaw25bOL/2g=
4646
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d h1:iUJYrbSvpV9n8vyl1sBt1GceM60HhHfnHxuzcm5apDg=

‎test/openshift/e2e/ginkgo/fixture/agent/fixture.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
routev1 "github.com/openshift/api/route/v1"
2424
appsv1 "k8s.io/api/apps/v1"
2525
corev1 "k8s.io/api/core/v1"
26+
networkingv1 "k8s.io/api/networking/v1"
2627
rbacv1 "k8s.io/api/rbac/v1"
2728
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2829
"k8s.io/apimachinery/pkg/types"
@@ -47,6 +48,7 @@ type PrincipalResources struct {
4748
ClusterRoleBinding *rbacv1.ClusterRoleBinding
4849
PrincipalDeployment *appsv1.Deployment
4950
PrincipalRoute *routev1.Route
51+
PrincipalNetworkPolicy *networkingv1.NetworkPolicy
5052
ServicesToDelete []string
5153
}
5254

@@ -102,6 +104,7 @@ type VerifyExpectedResourcesExistParams struct {
102104
ClusterRoleBinding *rbacv1.ClusterRoleBinding
103105
PrincipalDeployment *appsv1.Deployment
104106
PrincipalRoute *routev1.Route
107+
PrincipalNetworkPolicy *networkingv1.NetworkPolicy
105108
SecretNames AgentSecretNames
106109
ServiceNames []string
107110
DeploymentNames []string
@@ -118,6 +121,7 @@ func VerifyResourcesDeleted(resources PrincipalResources) {
118121
Eventually(resources.ClusterRole).Should(k8sFixture.NotExistByName())
119122
Eventually(resources.ClusterRoleBinding).Should(k8sFixture.NotExistByName())
120123
Eventually(resources.PrincipalDeployment).Should(k8sFixture.NotExistByName())
124+
Eventually(resources.PrincipalNetworkPolicy).Should(k8sFixture.NotExistByName())
121125

122126
for _, serviceName := range resources.ServicesToDelete {
123127
if serviceName == "" {
@@ -327,6 +331,7 @@ func VerifyExpectedResourcesExist(params VerifyExpectedResourcesExistParams) {
327331
Eventually(params.RoleBinding).Should(k8sFixture.ExistByName())
328332
Eventually(params.ClusterRole).Should(k8sFixture.ExistByName())
329333
Eventually(params.ClusterRoleBinding).Should(k8sFixture.ExistByName())
334+
Eventually(params.PrincipalNetworkPolicy).Should(k8sFixture.ExistByName())
330335

331336
for _, serviceName := range params.ServiceNames {
332337
if serviceName == "" {

0 commit comments

Comments
 (0)