Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LB Config Cleanup #161

Merged
merged 3 commits into from
Aug 29, 2023
Merged

LB Config Cleanup #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05f1892
Resolve allof/anyof with one entry
mattoni Aug 28, 2023
2377e0e
cleanup oneof anyof
mattoni Aug 28, 2023
8c40699
Merge branch 'main' into mattoni/lb-config-cleanup
mattoni Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions components/schemas/environments/services/lb/LoadBalancerConfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,7 @@ discriminator:
haproxy: ../../../stacks/spec/services/loadbalancer/types/haproxy/HaProxyLbType.yml
v1: ../../../stacks/spec/services/loadbalancer/types/v1/V1LbType.yml
default: ../../../stacks/spec/services/loadbalancer/types/DefaultLbType.yml
allOf:
- type: object
required:
- ipv4
- ipv6
properties:
ipv4:
type: boolean
description: Allow / disallow traffic to be routed via IPv4.
ipv6:
type: boolean
description: Allow / disallow traffic to be routed via IPv6.
- oneOf:
- $ref: ../../../stacks/spec/services/loadbalancer/types/v1/V1LbType.yml
- $ref: ../../../stacks/spec/services/loadbalancer/types/haproxy/HaProxyLbType.yml
- $ref: ../../../stacks/spec/services/loadbalancer/types/DefaultLbType.yml
oneOf:
- $ref: ../../../stacks/spec/services/loadbalancer/types/v1/V1LbType.yml
- $ref: ../../../stacks/spec/services/loadbalancer/types/haproxy/HaProxyLbType.yml
- $ref: ../../../stacks/spec/services/loadbalancer/types/DefaultLbType.yml
22 changes: 4 additions & 18 deletions components/schemas/stacks/spec/services/loadbalancer/StackSpecLoadBalancerConfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,7 @@ discriminator:
haproxy: types/haproxy/HaProxyLbType.yml
v1: types/v1/V1LbType.yml
default: types/DefaultLbType.yml
allOf:
- type: object
required:
- ipv4
- ipv6
properties:
ipv4:
nullable: true
type: boolean
description: Allow / disallow traffic to be routed via IPv4.
ipv6:
nullable: true
type: boolean
description: Allow / disallow traffic to be routed via IPv6.
- oneOf:
- $ref: ./types/haproxy/HaProxyLbType.yml
- $ref: ./types/v1/V1LbType.yml
- $ref: ./types/DefaultLbType.yml
oneOf:
- $ref: ./types/haproxy/HaProxyLbType.yml
- $ref: ./types/v1/V1LbType.yml
- $ref: ./types/DefaultLbType.yml
8 changes: 8 additions & 0 deletions components/schemas/stacks/spec/services/loadbalancer/types/DefaultLbType.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ type: object
required:
- type
- details
- ipv4
- ipv6
properties:
ipv4:
type: boolean
description: Allow / disallow traffic to be routed via IPv4.
ipv6:
type: boolean
description: Allow / disallow traffic to be routed via IPv6.
type:
type: string
enum:
Expand Down
8 changes: 8 additions & 0 deletions components/schemas/stacks/spec/services/loadbalancer/types/haproxy/HaProxyLbType.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ type: object
required:
- type
- details
- ipv4
- ipv6
properties:
ipv4:
type: boolean
description: Allow / disallow traffic to be routed via IPv4.
ipv6:
type: boolean
description: Allow / disallow traffic to be routed via IPv6.
type:
type: string
enum:
Expand Down
1 change: 0 additions & 1 deletion components/schemas/stacks/spec/services/loadbalancer/types/v1/V1LbConfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ properties:
mapping:
tcp: transports/TcpTransportConfig.yml
http: transports/HttpTransportConfig.yml

oneOf:
- $ref: transports/TcpTransportConfig.yml
- $ref: transports/HttpTransportConfig.yml
Expand Down
8 changes: 8 additions & 0 deletions components/schemas/stacks/spec/services/loadbalancer/types/v1/V1LbType.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ type: object
required:
- type
- details
- ipv4
- ipv6
properties:
ipv4:
type: boolean
description: Allow / disallow traffic to be routed via IPv4.
ipv6:
type: boolean
description: Allow / disallow traffic to be routed via IPv6.
type:
type: string
enum:
Expand Down