Skip to content

Commit 5238b24

Browse files
hrefhref
authored
Merge pull request #23 from cloudscale-ch/denis/reset-annotation
Make it possible to reset the CIDR annotation
2 parents 61c6837 + 7fa8cd7 commit 5238b24

17 files changed

+30
-47
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.24
66
replace github.com/google/cel-go => github.com/google/cel-go v0.17.7
77

88
require (
9-
golang.org/x/oauth2 v0.15.0
9+
golang.org/x/oauth2 v0.29.0
1010
k8s.io/api v0.29.0
1111
k8s.io/apimachinery v0.29.0
1212
k8s.io/cloud-provider v0.29.0
@@ -15,7 +15,7 @@ require (
1515
)
1616

1717
require (
18-
github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0
18+
github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.0
1919
github.com/google/uuid v1.5.0
2020
github.com/stretchr/testify v1.8.4
2121
k8s.io/client-go v0.29.0
@@ -30,6 +30,7 @@ require (
3030
github.com/beorn7/perks v1.0.1 // indirect
3131
github.com/blang/semver/v4 v4.0.0 // indirect
3232
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
33+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
3334
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3435
github.com/coreos/go-semver v0.3.1 // indirect
3536
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -93,7 +94,6 @@ require (
9394
golang.org/x/term v0.31.0 // indirect
9495
golang.org/x/text v0.24.0 // indirect
9596
golang.org/x/time v0.5.0 // indirect
96-
google.golang.org/appengine v1.6.8 // indirect
9797
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
9898
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
9999
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect

‎go.sum

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM=
22
cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
3-
cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
4-
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
5-
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
3+
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
4+
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
65
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
76
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
87
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
@@ -17,10 +16,12 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
1716
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
1817
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
1918
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
19+
github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
20+
github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
2021
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
2122
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
22-
github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0 h1:sB3uRgv3UVAdnpGM2ZxR6H5XyCbLHLRmaLheq8drRt4=
23-
github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0/go.mod h1:FfL+Dw1kbt/iutAP/vGqJV+1nu6azcKkYexjYIswDVw=
23+
github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.0 h1:lIVkmacVa4GogQ17dtrTEh/ph+k8gH2bsQcfJu/Tk0s=
24+
github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.0/go.mod h1:agOnbZIZJUfW4V/4s5wYX7IoXoixGxXzQhW30+fpGPU=
2425
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
2526
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
2627
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
@@ -69,7 +70,6 @@ github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w
6970
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
7071
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
7172
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
72-
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
7373
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
7474
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
7575
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
@@ -172,7 +172,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5
172172
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
173173
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
174174
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
175-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
176175
go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
177176
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
178177
go.etcd.io/etcd/api/v3 v3.5.11 h1:B54KwXbWDHyD3XYAwprxNzTe7vlhR69LuBgZnMVvS7E=
@@ -216,48 +215,35 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
216215
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
217216
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
218217
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
219-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
220218
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
221219
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
222220
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
223221
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
224222
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
225223
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
226-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
227224
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
228225
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
229226
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
230227
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
231-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
232-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
233228
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
234229
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
235-
golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
236-
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
230+
golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
231+
golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
237232
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
238233
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
239234
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
240-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
241235
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
242236
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
243237
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
244238
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
245239
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
246-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
247-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
248240
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
249-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
250-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
251241
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
252242
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
253-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
254-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
255243
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
256244
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
257245
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
258246
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
259-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
260-
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
261247
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
262248
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
263249
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -266,15 +252,12 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
266252
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
267253
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
268254
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
269-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
270255
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
271256
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
272257
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
273258
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
274259
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
275260
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
276-
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
277-
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
278261
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg=
279262
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0=
280263
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:rcS6EyEaoCO52hQDupoSfrxI3R6C2Tq741is7X8OvnM=

‎pkg/cloudscale_ccm/cloud.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
12+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1313
"golang.org/x/oauth2"
1414
"k8s.io/client-go/kubernetes"
1515
"k8s.io/klog/v2"

‎pkg/cloudscale_ccm/instances_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit"
7-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
7+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
88
"github.com/stretchr/testify/assert"
99
v1 "k8s.io/api/core/v1"
1010
)

‎pkg/cloudscale_ccm/lb_mapper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66

77
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/limiter"
8-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
8+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
99
)
1010

1111
// lbMapper maps cloudscale loadbalancers to Kubernetes services.

‎pkg/cloudscale_ccm/lb_mapper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit"
7-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
7+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
88
"github.com/stretchr/testify/assert"
99
)
1010

‎pkg/cloudscale_ccm/loadbalancer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99

1010
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/kubeutil"
11-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
11+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1212
v1 "k8s.io/api/core/v1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
"k8s.io/client-go/kubernetes"

‎pkg/cloudscale_ccm/reconcile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/actions"
1414
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/compare"
15-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
15+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1616
v1 "k8s.io/api/core/v1"
1717
"k8s.io/klog/v2"
1818
)

‎pkg/cloudscale_ccm/reconcile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/actions"
88
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit"
9-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
9+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1010
"github.com/stretchr/testify/assert"
1111
v1 "k8s.io/api/core/v1"
1212
)

‎pkg/cloudscale_ccm/server_mapper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77

88
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/limiter"
9-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
9+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1010
v1 "k8s.io/api/core/v1"
1111
)
1212

‎pkg/cloudscale_ccm/server_mapper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55

66
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit"
7-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
7+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
88
"github.com/stretchr/testify/assert"
99
v1 "k8s.io/api/core/v1"
1010
)

‎pkg/internal/actions/actions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
11+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1212
)
1313

1414
type Action interface {
@@ -256,7 +256,7 @@ func (a *CreateListenerAction) Run(
256256
Name: a.listener.Name,
257257
Protocol: a.listener.Protocol,
258258
ProtocolPort: a.listener.ProtocolPort,
259-
AllowedCIDRs: a.listener.AllowedCIDRs,
259+
AllowedCIDRs: &a.listener.AllowedCIDRs,
260260
TimeoutClientDataMS: a.listener.TimeoutClientDataMS,
261261
TimeoutMemberConnectMS: a.listener.TimeoutMemberConnectMS,
262262
TimeoutMemberDataMS: a.listener.TimeoutMemberDataMS,
@@ -292,7 +292,7 @@ func (a *UpdateListenerAllowedCIDRsAction) Run(
292292
err := client.LoadBalancerListeners.Update(ctx,
293293
a.listenerUUID,
294294
&cloudscale.LoadBalancerListenerRequest{
295-
AllowedCIDRs: a.allowedCIDRs,
295+
AllowedCIDRs: &a.allowedCIDRs,
296296
},
297297
)
298298

‎pkg/internal/actions/actions_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit"
9-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
9+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1010
"github.com/stretchr/testify/assert"
1111
)
1212

@@ -237,7 +237,7 @@ func TestCreateListenerAction(t *testing.T) {
237237
assert.Equal(t, "00000000-0000-0000-0000-000000000000", sent.Pool)
238238
assert.Equal(t, "tcp", sent.Protocol)
239239
assert.Equal(t, 80, sent.ProtocolPort)
240-
assert.Equal(t, []string{"10.0.0.0/24"}, sent.AllowedCIDRs)
240+
assert.Equal(t, []string{"10.0.0.0/24"}, *sent.AllowedCIDRs)
241241
assert.Equal(t, 1, sent.TimeoutClientDataMS)
242242
assert.Equal(t, 2, sent.TimeoutMemberConnectMS)
243243
assert.Equal(t, 3, sent.TimeoutMemberDataMS)
@@ -265,7 +265,7 @@ func TestUpdateListenerAllowedCIDRsAction(t *testing.T) {
265265
var sent cloudscale.LoadBalancerListenerRequest
266266
server.LastSent(&sent)
267267

268-
assert.Equal(t, []string{"10.0.0.0/24"}, sent.AllowedCIDRs)
268+
assert.Equal(t, []string{"10.0.0.0/24"}, *sent.AllowedCIDRs)
269269
}
270270

271271
func TestUpdateListenerTimeoutAction(t *testing.T) {

‎pkg/internal/integration/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
15+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1616
"github.com/stretchr/testify/suite"
1717
"golang.org/x/oauth2"
1818
v1 "k8s.io/api/core/v1"

‎pkg/internal/integration/node_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"time"
1010

11-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
11+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
1414
v1 "k8s.io/api/core/v1"

‎pkg/internal/integration/service_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/cloudscale_ccm"
1717
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/kubeutil"
1818
"github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit"
19-
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4"
19+
cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6"
2020
appsv1 "k8s.io/api/apps/v1"
2121
batchv1 "k8s.io/api/batch/v1"
2222
v1 "k8s.io/api/core/v1"

‎pkg/internal/testkit/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http/httptest"
99
"net/url"
1010

11-
"github.com/cloudscale-ch/cloudscale-go-sdk/v4"
11+
"github.com/cloudscale-ch/cloudscale-go-sdk/v6"
1212
)
1313

1414
// MockAPIServer is a mock http server that builds on httptest.Server and

0 commit comments

Comments
 (0)