Skip to content

Commit d51035c

Browse files
committed
Revert "set auto-created default clb name to portpool's name"
This reverts commit be1faf0.
1 parent 688578e commit d51035c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

internal/portpool/util/portpool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (p *PortPool) TryCreateLB(ctx context.Context) (portpool.CreateLbResult, er
6767
p.creating = false
6868
}()
6969
p.EventRecorder.Event(pp, corev1.EventTypeNormal, "CreateLoadBalancer", "try to create clb")
70-
lbId, err := clb.CreateCLB(ctx, pp.GetRegion(), clb.ConvertCreateLoadBalancerRequest(pp.Spec.AutoCreate.Parameters, pp.Name))
70+
lbId, err := clb.CreateCLB(ctx, pp.GetRegion(), clb.ConvertCreateLoadBalancerRequest(pp.Spec.AutoCreate.Parameters))
7171
if err != nil {
7272
p.EventRecorder.Eventf(pp, corev1.EventTypeWarning, "CreateLoadBalancer", "create clb failed: %s", err.Error())
7373
return portpool.CreateLbResultError, errors.WithStack(err)

pkg/clb/param.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import (
77
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
88
)
99

10-
func ConvertCreateLoadBalancerRequest(p *networkingv1alpha1.CreateLBParameters, name string) *clb.CreateLoadBalancerRequest {
10+
func ConvertCreateLoadBalancerRequest(p *networkingv1alpha1.CreateLBParameters) *clb.CreateLoadBalancerRequest {
1111
req := clb.NewCreateLoadBalancerRequest()
1212
req.LoadBalancerType = util.GetPtr("OPEN") // 默认使用公网 CLB
1313
req.VpcId = &clusterinfo.VpcId
14-
req.LoadBalancerName = &name
1514

1615
if p == nil { // 没指定参数,直接返回请求
1716
return req

0 commit comments

Comments
 (0)