Skip to content

Commit 1564094

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4990 from alexander-demicev/fixadditionallisteners
🐛Use generate name for CP loadbalancer listeners
2 parents ac80251 + 63db13a commit 1564094

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ require (
121121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
122122
github.com/golang/protobuf v1.5.4 // indirect
123123
github.com/google/btree v1.0.1 // indirect
124-
github.com/google/cel-go v0.17.7 // indirect
124+
github.com/google/cel-go v0.17.8 // indirect
125125
github.com/google/gnostic-models v0.6.8 // indirect
126126
github.com/google/go-github/v53 v53.2.0 // indirect
127127
github.com/google/go-querystring v1.1.0 // indirect
@@ -209,7 +209,7 @@ require (
209209
golang.org/x/sys v0.19.0 // indirect
210210
golang.org/x/term v0.19.0 // indirect
211211
golang.org/x/time v0.5.0 // indirect
212-
golang.org/x/tools v0.17.0 // indirect
212+
golang.org/x/tools v0.18.0 // indirect
213213
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
214214
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
215215
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
@@ -220,10 +220,10 @@ require (
220220
gopkg.in/yaml.v3 v3.0.1 // indirect
221221
k8s.io/cluster-bootstrap v0.29.3 // indirect
222222
k8s.io/component-helpers v0.29.3 // indirect
223-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
223+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
224224
k8s.io/kubectl v0.29.3 // indirect
225225
k8s.io/metrics v0.29.3 // indirect
226-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
226+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
227227
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
228228
sigs.k8s.io/kind v0.22.0 // indirect
229229
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ github.com/golangplus/testing v1.0.0 h1:+ZeeiKZENNOMkTTELoSySazi+XaEhVO0mb+eanrS
204204
github.com/golangplus/testing v1.0.0/go.mod h1:ZDreixUV3YzhoVraIDyOzHrr76p6NUh6k/pPg/Q3gYA=
205205
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
206206
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
207-
github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
208-
github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
207+
github.com/google/cel-go v0.17.8 h1:j9m730pMZt1Fc4oKhCLUHfjj6527LuhYcYw0Rl8gqto=
208+
github.com/google/cel-go v0.17.8/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
209209
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
210210
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
211211
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -642,8 +642,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
642642
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
643643
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
644644
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
645-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
646-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
645+
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
646+
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
647647
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
648648
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
649649
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -737,8 +737,8 @@ k8s.io/metrics v0.29.3 h1:nN+eavbMQ7Kuif2tIdTr2/F2ec2E/SIAWSruTZ+Ye6U=
737737
k8s.io/metrics v0.29.3/go.mod h1:kb3tGGC4ZcIDIuvXyUE291RwJ5WmDu0tB4wAVZM6h2I=
738738
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
739739
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
740-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
741-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
740+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c=
741+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4=
742742
sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb4e6Rs9gA=
743743
sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
744744
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=

‎pkg/cloud/services/elb/loadbalancer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"github.com/pkg/errors"
3535
kerrors "k8s.io/apimachinery/pkg/util/errors"
3636
"k8s.io/apimachinery/pkg/util/sets"
37+
"k8s.io/apiserver/pkg/storage/names"
3738

3839
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
3940
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/awserrors"
@@ -263,7 +264,7 @@ func (s *Service) getAPIServerLBSpec(elbName string, lbSpec *infrav1.AWSLoadBala
263264
Protocol: infrav1.ELBProtocolTCP,
264265
Port: infrav1.DefaultAPIServerPort,
265266
TargetGroup: infrav1.TargetGroupSpec{
266-
Name: fmt.Sprintf("apiserver-target-%d", time.Now().Unix()),
267+
Name: names.SimpleNameGenerator.GenerateName("apiserver-target-"),
267268
Port: infrav1.DefaultAPIServerPort,
268269
Protocol: infrav1.ELBProtocolTCP,
269270
VpcID: s.scope.VPC().ID,
@@ -288,7 +289,7 @@ func (s *Service) getAPIServerLBSpec(elbName string, lbSpec *infrav1.AWSLoadBala
288289
Protocol: listener.Protocol,
289290
Port: listener.Port,
290291
TargetGroup: infrav1.TargetGroupSpec{
291-
Name: fmt.Sprintf("additional-listener-%d", time.Now().Unix()),
292+
Name: names.SimpleNameGenerator.GenerateName("additional-listener-"),
292293
Port: listener.Port,
293294
Protocol: listener.Protocol,
294295
VpcID: s.scope.VPC().ID,

0 commit comments

Comments
 (0)