scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7783 from GoogleCloudPlatform/revert-7609-lb

Browse Source 
Revert "Truncate GCE load balancer names to 63 chars"
This commit is contained in:
Alex Robinson
2015-05-05 15:23:35 -07:00
parent 5d7b33b8f2 1c7f6b82c7
commit 5be3a5a9dc
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/cloudprovider/gce/gce.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package gce_cloud package gce_cloud
import ( import (
"crypto/md5"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@@ -43,8 +42,6 @@ import (
"google.golang.org/cloud/compute/metadata" "google.golang.org/cloud/compute/metadata"
) )
const LOAD_BALANCER_NAME_MAX_LENGTH = 63
// GCECloud is an implementation of Interface, TCPLoadBalancer and Instances for Google Compute Engine. // GCECloud is an implementation of Interface, TCPLoadBalancer and Instances for Google Compute Engine.
type GCECloud struct { type GCECloud struct {
service *compute.Service service *compute.Service
@@ -269,23 +266,10 @@ func translateAffinityType(affinityType api.AffinityType) GCEAffinityType {
} }
} }
func normalizeName(name string) string {
// If it's short enough, just leave it.
if len(name) < LOAD_BALANCER_NAME_MAX_LENGTH-6 {
return name
}
// Hash and truncate
hash := md5.Sum([]byte(name))
truncated := name[0 : LOAD_BALANCER_NAME_MAX_LENGTH-6]
shortHash := hash[0:6]
return fmt.Sprintf("%s%s", truncated, string(shortHash))
}
// CreateTCPLoadBalancer is an implementation of TCPLoadBalancer.CreateTCPLoadBalancer. // CreateTCPLoadBalancer is an implementation of TCPLoadBalancer.CreateTCPLoadBalancer.
// TODO(a-robinson): Don't just ignore specified IP addresses. Check if they're // TODO(a-robinson): Don't just ignore specified IP addresses. Check if they're
// owned by the project and available to be used, and use them if they are. // owned by the project and available to be used, and use them if they are.
func (gce *GCECloud) CreateTCPLoadBalancer(origName, region string, externalIP net.IP, ports []int, hosts []string, affinityType api.AffinityType) (string, error) { func (gce *GCECloud) CreateTCPLoadBalancer(name, region string, externalIP net.IP, ports []int, hosts []string, affinityType api.AffinityType) (string, error) {
name := normalizeName(origName)
err := gce.makeTargetPool(name, region, hosts, translateAffinityType(affinityType)) err := gce.makeTargetPool(name, region, hosts, translateAffinityType(affinityType))
if err != nil { if err != nil {
if !isHTTPErrorCode(err, http.StatusConflict) { if !isHTTPErrorCode(err, http.StatusConflict) {
@@ -331,8 +315,7 @@ func (gce *GCECloud) CreateTCPLoadBalancer(origName, region string, externalIP n
} }
// UpdateTCPLoadBalancer is an implementation of TCPLoadBalancer.UpdateTCPLoadBalancer. // UpdateTCPLoadBalancer is an implementation of TCPLoadBalancer.UpdateTCPLoadBalancer.
func (gce *GCECloud) UpdateTCPLoadBalancer(origName, region string, hosts []string) error { func (gce *GCECloud) UpdateTCPLoadBalancer(name, region string, hosts []string) error {
name := normalizeName(origName)
pool, err := gce.service.TargetPools.Get(gce.projectID, region, name).Do() pool, err := gce.service.TargetPools.Get(gce.projectID, region, name).Do()
if err != nil { if err != nil {
return err return err
@@ -377,8 +360,7 @@ func (gce *GCECloud) UpdateTCPLoadBalancer(origName, region string, hosts []stri
} }
// DeleteTCPLoadBalancer is an implementation of TCPLoadBalancer.DeleteTCPLoadBalancer. // DeleteTCPLoadBalancer is an implementation of TCPLoadBalancer.DeleteTCPLoadBalancer.
func (gce *GCECloud) DeleteTCPLoadBalancer(origName, region string) error { func (gce *GCECloud) DeleteTCPLoadBalancer(name, region string) error {
name := normalizeName(origName)
op, err := gce.service.ForwardingRules.Delete(gce.projectID, region, name).Do() op, err := gce.service.ForwardingRules.Delete(gce.projectID, region, name).Do()
if err != nil && isHTTPErrorCode(err, http.StatusNotFound) { if err != nil && isHTTPErrorCode(err, http.StatusNotFound) {
glog.Infof("Forwarding rule %s already deleted. Continuing to delete target pool.", name) glog.Infof("Forwarding rule %s already deleted. Continuing to delete target pool.", name)