Skip to content

Commit 5067724

Browse files
authored
Merge pull request #91 from jtherin/pick-0.19-zonedlb
chore: migrate to zoned lb api
2 parents 634eae1 + bc9b97d commit 5067724

File tree

5 files changed

+95
-63
lines changed

5 files changed

+95
-63
lines changed

docs/loadbalancer-annotations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Note:
2525
- If an annotation is not specified, the cloud controller manager will apply default configuration.
2626
2727
### `service.beta.kubernetes.io/scw-loadbalancer-id`
28-
This annotation is the ID of the loadbalancer to use. It is populated by the CCM with the new LB ID if it doesn't exist.
29-
It has the form `<region>/<lb-id>`.
28+
This annotation is the ID of the loadbalancer to use. It is populated by the CCM with the new LB ID if the annotation does not exist.
29+
It has the form `<zone>/<lb-id>`.
3030

3131
### `service.beta.kubernetes.io/scw-loadbalancer-forward-port-algorithm`
3232
This is the annotation to choose the load balancing algorithm.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/scaleway/scaleway-cloud-controller-manager
33
go 1.15
44

55
require (
6-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200820094136-e5e36003a999
6+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210817142252-2836d8ffcc09
77
k8s.io/api v0.19.0
88
k8s.io/apimachinery v0.19.0
99
k8s.io/client-go v0.19.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/
479479
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
480480
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
481481
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
482-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200820094136-e5e36003a999 h1:JfTFkJt8n60HtsfHw5e6A1gim8W2kQ57uOXLLQES40w=
483-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200820094136-e5e36003a999/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
482+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210817142252-2836d8ffcc09 h1:yhJDl3IfiMEtenYzmBE8txehmXD9jztfUTtpdLb/WYU=
483+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210817142252-2836d8ffcc09/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
484484
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
485485
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
486486
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=

0 commit comments

Comments
 (0)