Skip to content

Commit af3e0e8

Browse files
authored
feat(lb): add support for ssl-bridging (#2527)
1 parent 5e870a1 commit af3e0e8

File tree

6 files changed

+21
-3
lines changed

6 files changed

+21
-3
lines changed

cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ ARGS:
3333
[on-marked-down-action] Modify what occurs when a backend server is marked down (on_marked_down_action_none | shutdown_sessions)
3434
[proxy-protocol] PROXY protocol, forward client's address (must be supported by backend servers software) (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn)
3535
[failover-host] Scaleway S3 bucket website to be served in case all backend servers are down
36+
[ssl-bridging] Enable SSL between load balancer and backend servers
3637
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-1)
3738

3839
DEPRECATED ARGS:

cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ARGS:
1919
[on-marked-down-action] Modify what occurs when a backend server is marked down (on_marked_down_action_none | shutdown_sessions)
2020
[proxy-protocol] PROXY protocol, forward client's address (must be supported by backend servers software) (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn)
2121
[failover-host] Scaleway S3 bucket website to be served in case all backend servers are down
22+
[ssl-bridging] Enable SSL between load balancer and backend servers
2223
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | pl-waw-1)
2324

2425
DEPRECATED ARGS:

docs/commands/lb.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ scw lb backend create [arg=value ...]
270270
| on-marked-down-action | One of: `on_marked_down_action_none`, `shutdown_sessions` | Modify what occurs when a backend server is marked down |
271271
| proxy-protocol | One of: `proxy_protocol_unknown`, `proxy_protocol_none`, `proxy_protocol_v1`, `proxy_protocol_v2`, `proxy_protocol_v2_ssl`, `proxy_protocol_v2_ssl_cn` | PROXY protocol, forward client's address (must be supported by backend servers software) |
272272
| failover-host | | Scaleway S3 bucket website to be served in case all backend servers are down |
273+
| ssl-bridging | | Enable SSL between load balancer and backend servers |
273274
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1` | Zone to target. If none is passed will use default zone from the config |
274275

275276

@@ -407,6 +408,7 @@ scw lb backend update <backend-id ...> [arg=value ...]
407408
| on-marked-down-action | One of: `on_marked_down_action_none`, `shutdown_sessions` | Modify what occurs when a backend server is marked down |
408409
| proxy-protocol | One of: `proxy_protocol_unknown`, `proxy_protocol_none`, `proxy_protocol_v1`, `proxy_protocol_v2`, `proxy_protocol_v2_ssl`, `proxy_protocol_v2_ssl_cn` | PROXY protocol, forward client's address (must be supported by backend servers software) |
409410
| failover-host | | Scaleway S3 bucket website to be served in case all backend servers are down |
411+
| ssl-bridging | | Enable SSL between load balancer and backend servers |
410412
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1`, `nl-ams-2`, `pl-waw-1` | Zone to target. If none is passed will use default zone from the config |
411413

412414

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/kubernetes-client/go-base v0.0.0-20190205182333-3d0e39759d98
1919
github.com/mattn/go-colorable v0.1.13
2020
github.com/mattn/go-isatty v0.0.16
21-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220922123105-d795c16b0465
21+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220927063754-25d7e886a8d3
2222
github.com/spf13/cobra v1.5.0
2323
github.com/spf13/pflag v1.0.5
2424
github.com/stretchr/testify v1.8.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw
7171
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
7272
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7373
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
74-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220922123105-d795c16b0465 h1:U8EnZ9Y5MkGsjwFgSryf1HEQDTMxrkDahqim2qwD8f4=
75-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220922123105-d795c16b0465/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
74+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220927063754-25d7e886a8d3 h1:OvmVF/0fY1foD5ZCuGhtPmW24WLYgFah99FPuembYAo=
75+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9.0.20220927063754-25d7e886a8d3/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
7676
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
7777
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
7878
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=

internal/namespaces/lb/v1/lb_cli.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,13 @@ func lbBackendCreate() *core.Command {
863863
Deprecated: false,
864864
Positional: false,
865865
},
866+
{
867+
Name: "ssl-bridging",
868+
Short: `Enable SSL between load balancer and backend servers`,
869+
Required: false,
870+
Deprecated: false,
871+
Positional: false,
872+
},
866873
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1),
867874
},
868875
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -1019,6 +1026,13 @@ func lbBackendUpdate() *core.Command {
10191026
Deprecated: false,
10201027
Positional: false,
10211028
},
1029+
{
1030+
Name: "ssl-bridging",
1031+
Short: `Enable SSL between load balancer and backend servers`,
1032+
Required: false,
1033+
Deprecated: false,
1034+
Positional: false,
1035+
},
10221036
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw1),
10231037
},
10241038
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {

0 commit comments

Comments
 (0)