Skip to content

Commit

Permalink
Merge pull request #31 from civo/service-name
Browse files Browse the repository at this point in the history
rename loadbalancer.user_given_name into loadbalancer.service_name
  • Loading branch information
alessandroargentieri authored Feb 29, 2024
2 parents 6ec0395 + fc34f7a commit 0f55cf3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cloud-controller-manager/civo/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (l *loadbalancer) updateLBConfig(civolb *civogo.LoadBalancer, service *v1.S
lbuc := civogo.LoadBalancerUpdateConfig{
ExternalTrafficPolicy: string(service.Spec.ExternalTrafficPolicy),
Region: Region,
UserGivenName: civolb.UserGivenName,
ServiceName: civolb.ServiceName,
}

if enableProxyProtocol := getEnableProxyProtocol(service); enableProxyProtocol != "" {
Expand Down Expand Up @@ -383,7 +383,7 @@ func createLoadBalancer(ctx context.Context, clusterName string, service *v1.Ser
}
lbc := civogo.LoadBalancerConfig{
Name: getLoadBalancerName(cluster.Name, service),
UserGivenName: service.Name,
ServiceName: service.Name,
ClusterID: ClusterID,
NetworkID: cluster.NetworkID,
ExternalTrafficPolicy: string(service.Spec.ExternalTrafficPolicy),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/civo/civo-cloud-controller-manager
go 1.20

require (
github.com/civo/civogo v0.3.60
github.com/civo/civogo v0.3.61
github.com/joho/godotenv v1.4.0
github.com/onsi/gomega v1.27.7
k8s.io/api v0.27.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/civo/civogo v0.3.60 h1:hPZqJvGRgvOxYdqT5BFTfWtfLw/zz/qKzRKf0gvK5B8=
github.com/civo/civogo v0.3.60/go.mod h1:54lv/FOf7gh6wE9ZwVdw4yBehk8V1CvU9aWa4v6dvW0=
github.com/civo/civogo v0.3.61 h1:+SZCl2dAHE/vMvn/eFWJP0vkAEaHFAXnYsaqbf5iJOc=
github.com/civo/civogo v0.3.61/go.mod h1:54lv/FOf7gh6wE9ZwVdw4yBehk8V1CvU9aWa4v6dvW0=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
Expand Down

0 comments on commit 0f55cf3

Please sign in to comment.