Skip to content

Commit

Permalink
Fix indentation of egress field in ACNP yamls (#1314)
Browse files Browse the repository at this point in the history 
This causes validation errors in ClusterNetworkPolicies when egress rules are specified. This PR also enables antrea
NetworkPolicy tests.
  • Loading branch information
@abhiraut
abhiraut authored Sep 29, 2020
1 parent fac4ecb commit e8e716e
Show file tree
Hide file tree
Showing 7 changed files with 214 additions and 311 deletions.
88 changes: 36 additions & 52 deletions build/yamls/antrea-aks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,44 +91,44 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
ingress:
egress:
items:
egress:
items:
properties:
action:
enum:
- Allow
- Drop
type: string
ports:
items:
properties:
action:
enum:
- Allow
- Drop
type: string
ports:
items:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
type: string
type: object
type: array
to:
items:
properties:
ipBlock:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
cidr:
format: cidr
type: string
type: object
type: array
to:
items:
properties:
ipBlock:
properties:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
required:
- action
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
required:
- action
type: object
type: array
ingress:
items:
properties:
action:
enum:
Expand All @@ -137,27 +137,11 @@ spec:
type: string
from:
items:
from:
items:
properties:
ipBlock:
properties:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
properties:
ipBlock:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
Expand Down
88 changes: 36 additions & 52 deletions build/yamls/antrea-eks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,44 +91,44 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
ingress:
egress:
items:
egress:
items:
properties:
action:
enum:
- Allow
- Drop
type: string
ports:
items:
properties:
action:
enum:
- Allow
- Drop
type: string
ports:
items:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
type: string
type: object
type: array
to:
items:
properties:
ipBlock:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
cidr:
format: cidr
type: string
type: object
type: array
to:
items:
properties:
ipBlock:
properties:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
required:
- action
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
required:
- action
type: object
type: array
ingress:
items:
properties:
action:
enum:
Expand All @@ -137,27 +137,11 @@ spec:
type: string
from:
items:
from:
items:
properties:
ipBlock:
properties:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
properties:
ipBlock:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
Expand Down
88 changes: 36 additions & 52 deletions build/yamls/antrea-gke.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,44 +91,44 @@ spec:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
ingress:
egress:
items:
egress:
items:
properties:
action:
enum:
- Allow
- Drop
type: string
ports:
items:
properties:
action:
enum:
- Allow
- Drop
type: string
ports:
items:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
type: string
type: object
type: array
to:
items:
properties:
ipBlock:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
cidr:
format: cidr
type: string
type: object
type: array
to:
items:
properties:
ipBlock:
properties:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
required:
- action
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
required:
- action
type: object
type: array
ingress:
items:
properties:
action:
enum:
Expand All @@ -137,27 +137,11 @@ spec:
type: string
from:
items:
from:
items:
properties:
ipBlock:
properties:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
type: array
properties:
ipBlock:
properties:
port:
x-kubernetes-int-or-string: true
protocol:
cidr:
format: cidr
type: string
type: object
namespaceSelector:
Expand Down
Loading

0 comments on commit e8e716e

Please sign in to comment.