Skip to content

Commit

Permalink
Revert LogSettings use LogLabel
Browse files Browse the repository at this point in the history 
Signed-off-by: Qiyue Yao <yaoq@vmware.com>
  • Loading branch information
@qiyueyao
qiyueyao committed May 17, 2023
1 parent b234534 commit 2a21841
Show file tree
Hide file tree
Showing 40 changed files with 421 additions and 1,146 deletions.
26 changes: 6 additions & 20 deletions build/charts/antrea/crds/clusternetworkpolicy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,16 +383,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -655,16 +648,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down
26 changes: 6 additions & 20 deletions build/charts/antrea/crds/networkpolicy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,16 +326,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -569,16 +562,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down
52 changes: 12 additions & 40 deletions build/yamls/antrea-aks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,16 +761,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -1033,16 +1026,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down Expand Up @@ -1877,16 +1863,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -2120,16 +2099,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down
52 changes: 12 additions & 40 deletions build/yamls/antrea-crds.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,16 +754,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -1026,16 +1019,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down Expand Up @@ -1858,16 +1844,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -2101,16 +2080,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down
52 changes: 12 additions & 40 deletions build/yamls/antrea-eks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,16 +761,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -1033,16 +1026,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down Expand Up @@ -1877,16 +1863,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -2120,16 +2099,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down
52 changes: 12 additions & 40 deletions build/yamls/antrea-gke.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,16 +761,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -1033,16 +1026,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down Expand Up @@ -1877,16 +1863,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
egress:
type: array
items:
Expand Down Expand Up @@ -2120,16 +2099,9 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
logLabel:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
status:
type: object
properties:
Expand Down
Loading

0 comments on commit 2a21841

Please sign in to comment.