DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #957 from nicksardo/glbc-cleanup

Browse source 
[GLBC] Minor cleanup for logging & future changes
This commit is contained in:
Nick Sardo 2017-07-17 18:06:57 -07:00 committed by GitHub
commit 05ef427a7b
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controllers/gce/backends/backends.go
View file

@ -443,6 +443,7 @@ func (b *Backends) Status(name string) string {
} }
func applyLegacyHCToHC(existing *compute.HttpHealthCheck, hc *healthchecks.HealthCheck) { func applyLegacyHCToHC(existing *compute.HttpHealthCheck, hc *healthchecks.HealthCheck) {
hc.Description = existing.Description
hc.CheckIntervalSec = existing.CheckIntervalSec hc.CheckIntervalSec = existing.CheckIntervalSec
hc.HealthyThreshold = existing.HealthyThreshold hc.HealthyThreshold = existing.HealthyThreshold
hc.Host = existing.Host hc.Host = existing.Host

4
controllers/gce/backends/backends_test.go
View file

@ -136,6 +136,7 @@ func TestHealthCheckMigration(t *testing.T) {
Name: namer.BeName(p.Port), Name: namer.BeName(p.Port),
RequestPath: "/my-healthz-path", RequestPath: "/my-healthz-path",
Host: "k8s.io", Host: "k8s.io",
Description: "My custom HC",
UnhealthyThreshold: 30, UnhealthyThreshold: 30,
CheckIntervalSec: 40, CheckIntervalSec: 40,
} }
@ -154,7 +155,8 @@ func TestHealthCheckMigration(t *testing.T) {
if hc.RequestPath != legacyHC.RequestPath || if hc.RequestPath != legacyHC.RequestPath ||
hc.Host != legacyHC.Host || hc.Host != legacyHC.Host ||
hc.UnhealthyThreshold != legacyHC.UnhealthyThreshold || hc.UnhealthyThreshold != legacyHC.UnhealthyThreshold ||
hc.CheckIntervalSec != legacyHC.CheckIntervalSec { hc.CheckIntervalSec != legacyHC.CheckIntervalSec ||
hc.Description != legacyHC.Description {
t.Fatalf("Expected newer health check to have identical settings to legacy health check. Legacy: %+v, New: %+v", legacyHC, hc) t.Fatalf("Expected newer health check to have identical settings to legacy health check. Legacy: %+v, New: %+v", legacyHC, hc)
} }
} }

11
controllers/gce/loadbalancers/loadbalancers.go
View file

@ -163,7 +163,7 @@ func (l *L7s) Delete(name string) error {
// Sync loadbalancers with the given runtime info from the controller. // Sync loadbalancers with the given runtime info from the controller.
func (l *L7s) Sync(lbs []*L7RuntimeInfo) error { func (l *L7s) Sync(lbs []*L7RuntimeInfo) error {
glog.V(3).Infof("Creating loadbalancers %+v", lbs) glog.V(3).Infof("Syncing loadbalancers %v", lbs)
if len(lbs) != 0 { if len(lbs) != 0 {
// Lazily create a default backend so we don't tax users who don't care // Lazily create a default backend so we don't tax users who don't care
@ -257,6 +257,11 @@ type L7RuntimeInfo struct {
StaticIPName string StaticIPName string
} }
// String returns the load balancer name
func (l *L7RuntimeInfo) String() string {
return l.Name
}
// L7 represents a single L7 loadbalancer. // L7 represents a single L7 loadbalancer.
type L7 struct { type L7 struct {
Name string Name string
@ -757,7 +762,6 @@ func (l *L7) UpdateUrlMap(ingressRules utils.GCEURLMap) error {
if l.um == nil { if l.um == nil {
return fmt.Errorf("cannot add url without an urlmap") return fmt.Errorf("cannot add url without an urlmap")
} }
glog.V(3).Infof("Updating urlmap for l7 %v", l.Name)
// All UrlMaps must have a default backend. If the Ingress has a default // All UrlMaps must have a default backend. If the Ingress has a default
// backend, it applies to all host rules as well as to the urlmap itself. // backend, it applies to all host rules as well as to the urlmap itself.
@ -807,7 +811,8 @@ func (l *L7) UpdateUrlMap(ingressRules utils.GCEURLMap) error {
glog.Infof("UrlMap for l7 %v is unchanged", l.Name) glog.Infof("UrlMap for l7 %v is unchanged", l.Name)
return nil return nil
} }
glog.Infof("Updating url map: %+v", ingressRules)
glog.V(3).Infof("Updating URLMap: %q", l.Name)
um, err := l.cloud.UpdateUrlMap(l.um) um, err := l.cloud.UpdateUrlMap(l.um)
if err != nil { if err != nil {
return err return err

2
controllers/gce/utils/utils.go
View file

@ -191,7 +191,6 @@ func (n *Namer) ParseName(name string) *NameComponents {
// NameBelongsToCluster checks if a given name is tagged with this cluster's UID. // NameBelongsToCluster checks if a given name is tagged with this cluster's UID.
func (n *Namer) NameBelongsToCluster(name string) bool { func (n *Namer) NameBelongsToCluster(name string) bool {
if !strings.HasPrefix(name, "k8s-") { if !strings.HasPrefix(name, "k8s-") {
glog.V(4).Infof("%v not part of cluster", name)
return false return false
} }
parts := strings.Split(name, clusterNameDelimiter) parts := strings.Split(name, clusterNameDelimiter)
@ -203,7 +202,6 @@ func (n *Namer) NameBelongsToCluster(name string) bool {
return false return false
} }
if len(parts) > 2 { if len(parts) > 2 {
glog.Warningf("Too many parts to name %v, ignoring", name)
return false return false
} }
return parts[1] == clusterName return parts[1] == clusterName