diff --git a/go.mod b/go.mod index d5b900a..9011479 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.24 replace github.com/google/cel-go => github.com/google/cel-go v0.17.7 require ( - golang.org/x/oauth2 v0.15.0 + golang.org/x/oauth2 v0.29.0 k8s.io/api v0.29.0 k8s.io/apimachinery v0.29.0 k8s.io/cloud-provider v0.29.0 @@ -15,7 +15,7 @@ require ( ) require ( - github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0 + github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.0 github.com/google/uuid v1.5.0 github.com/stretchr/testify v1.8.4 k8s.io/client-go v0.29.0 @@ -30,6 +30,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/cenkalti/backoff/v5 v5.0.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect @@ -93,7 +94,6 @@ require ( golang.org/x/term v0.31.0 // indirect golang.org/x/text v0.24.0 // indirect golang.org/x/time v0.5.0 // indirect - google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect diff --git a/go.sum b/go.sum index 600f70e..1e4fa75 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,7 @@ cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= 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 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8= +github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0 h1:sB3uRgv3UVAdnpGM2ZxR6H5XyCbLHLRmaLheq8drRt4= -github.com/cloudscale-ch/cloudscale-go-sdk/v4 v4.0.0/go.mod h1:FfL+Dw1kbt/iutAP/vGqJV+1nu6azcKkYexjYIswDVw= +github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.0 h1:lIVkmacVa4GogQ17dtrTEh/ph+k8gH2bsQcfJu/Tk0s= +github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.0/go.mod h1:agOnbZIZJUfW4V/4s5wYX7IoXoixGxXzQhW30+fpGPU= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= 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 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= 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 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= 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= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= -golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= -golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= +golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98= +golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= 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 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:rcS6EyEaoCO52hQDupoSfrxI3R6C2Tq741is7X8OvnM= diff --git a/pkg/cloudscale_ccm/cloud.go b/pkg/cloudscale_ccm/cloud.go index 00941e3..9ea001e 100644 --- a/pkg/cloudscale_ccm/cloud.go +++ b/pkg/cloudscale_ccm/cloud.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "golang.org/x/oauth2" "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" diff --git a/pkg/cloudscale_ccm/instances_test.go b/pkg/cloudscale_ccm/instances_test.go index 4783188..7adf88f 100644 --- a/pkg/cloudscale_ccm/instances_test.go +++ b/pkg/cloudscale_ccm/instances_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloudscale_ccm/lb_mapper.go b/pkg/cloudscale_ccm/lb_mapper.go index 30d559f..3d1c1c6 100644 --- a/pkg/cloudscale_ccm/lb_mapper.go +++ b/pkg/cloudscale_ccm/lb_mapper.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/limiter" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" ) // lbMapper maps cloudscale loadbalancers to Kubernetes services. diff --git a/pkg/cloudscale_ccm/lb_mapper_test.go b/pkg/cloudscale_ccm/lb_mapper_test.go index 90bf54b..0529493 100644 --- a/pkg/cloudscale_ccm/lb_mapper_test.go +++ b/pkg/cloudscale_ccm/lb_mapper_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cloudscale_ccm/loadbalancer.go b/pkg/cloudscale_ccm/loadbalancer.go index 0cbe3de..b770e8d 100644 --- a/pkg/cloudscale_ccm/loadbalancer.go +++ b/pkg/cloudscale_ccm/loadbalancer.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/kubeutil" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/cloudscale_ccm/reconcile.go b/pkg/cloudscale_ccm/reconcile.go index dc980b3..501cdee 100644 --- a/pkg/cloudscale_ccm/reconcile.go +++ b/pkg/cloudscale_ccm/reconcile.go @@ -12,7 +12,7 @@ import ( "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/actions" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/compare" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" ) diff --git a/pkg/cloudscale_ccm/reconcile_test.go b/pkg/cloudscale_ccm/reconcile_test.go index 14f2435..b8bd6f2 100644 --- a/pkg/cloudscale_ccm/reconcile_test.go +++ b/pkg/cloudscale_ccm/reconcile_test.go @@ -6,7 +6,7 @@ import ( "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/actions" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloudscale_ccm/server_mapper.go b/pkg/cloudscale_ccm/server_mapper.go index a0fd9cf..74150da 100644 --- a/pkg/cloudscale_ccm/server_mapper.go +++ b/pkg/cloudscale_ccm/server_mapper.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/limiter" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/cloudscale_ccm/server_mapper_test.go b/pkg/cloudscale_ccm/server_mapper_test.go index 0e16f39..4e7f91c 100644 --- a/pkg/cloudscale_ccm/server_mapper_test.go +++ b/pkg/cloudscale_ccm/server_mapper_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/internal/actions/actions.go b/pkg/internal/actions/actions.go index ffdddb8..62ca4fb 100644 --- a/pkg/internal/actions/actions.go +++ b/pkg/internal/actions/actions.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" ) type Action interface { @@ -256,7 +256,7 @@ func (a *CreateListenerAction) Run( Name: a.listener.Name, Protocol: a.listener.Protocol, ProtocolPort: a.listener.ProtocolPort, - AllowedCIDRs: a.listener.AllowedCIDRs, + AllowedCIDRs: &a.listener.AllowedCIDRs, TimeoutClientDataMS: a.listener.TimeoutClientDataMS, TimeoutMemberConnectMS: a.listener.TimeoutMemberConnectMS, TimeoutMemberDataMS: a.listener.TimeoutMemberDataMS, @@ -292,7 +292,7 @@ func (a *UpdateListenerAllowedCIDRsAction) Run( err := client.LoadBalancerListeners.Update(ctx, a.listenerUUID, &cloudscale.LoadBalancerListenerRequest{ - AllowedCIDRs: a.allowedCIDRs, + AllowedCIDRs: &a.allowedCIDRs, }, ) diff --git a/pkg/internal/actions/actions_test.go b/pkg/internal/actions/actions_test.go index a0de466..48adecf 100644 --- a/pkg/internal/actions/actions_test.go +++ b/pkg/internal/actions/actions_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/assert" ) @@ -237,7 +237,7 @@ func TestCreateListenerAction(t *testing.T) { assert.Equal(t, "00000000-0000-0000-0000-000000000000", sent.Pool) assert.Equal(t, "tcp", sent.Protocol) assert.Equal(t, 80, sent.ProtocolPort) - assert.Equal(t, []string{"10.0.0.0/24"}, sent.AllowedCIDRs) + assert.Equal(t, []string{"10.0.0.0/24"}, *sent.AllowedCIDRs) assert.Equal(t, 1, sent.TimeoutClientDataMS) assert.Equal(t, 2, sent.TimeoutMemberConnectMS) assert.Equal(t, 3, sent.TimeoutMemberDataMS) @@ -265,7 +265,7 @@ func TestUpdateListenerAllowedCIDRsAction(t *testing.T) { var sent cloudscale.LoadBalancerListenerRequest server.LastSent(&sent) - assert.Equal(t, []string{"10.0.0.0/24"}, sent.AllowedCIDRs) + assert.Equal(t, []string{"10.0.0.0/24"}, *sent.AllowedCIDRs) } func TestUpdateListenerTimeoutAction(t *testing.T) { diff --git a/pkg/internal/integration/main_test.go b/pkg/internal/integration/main_test.go index 07bd6f5..3de90ad 100644 --- a/pkg/internal/integration/main_test.go +++ b/pkg/internal/integration/main_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/suite" "golang.org/x/oauth2" v1 "k8s.io/api/core/v1" diff --git a/pkg/internal/integration/node_test.go b/pkg/internal/integration/node_test.go index facf79b..75d0f43 100644 --- a/pkg/internal/integration/node_test.go +++ b/pkg/internal/integration/node_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" diff --git a/pkg/internal/integration/service_test.go b/pkg/internal/integration/service_test.go index 7b636f7..c4e0997 100644 --- a/pkg/internal/integration/service_test.go +++ b/pkg/internal/integration/service_test.go @@ -16,7 +16,7 @@ import ( "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/cloudscale_ccm" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/kubeutil" "github.com/cloudscale-ch/cloudscale-cloud-controller-manager/pkg/internal/testkit" - cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + cloudscale "github.com/cloudscale-ch/cloudscale-go-sdk/v6" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/internal/testkit/api.go b/pkg/internal/testkit/api.go index 0ae9c0c..9b37821 100644 --- a/pkg/internal/testkit/api.go +++ b/pkg/internal/testkit/api.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "net/url" - "github.com/cloudscale-ch/cloudscale-go-sdk/v4" + "github.com/cloudscale-ch/cloudscale-go-sdk/v6" ) // MockAPIServer is a mock http server that builds on httptest.Server and