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

Copy over legacy description; remove unnecessary/verbose log lines

Browse source
This commit is contained in:
Nick Sardo 2017-07-17 17:14:43 -07:00
parent 26fccdc48b
commit 25b2723b33
4 changed files with 12 additions and 6 deletions
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) {
hc.Description = existing.Description
hc.CheckIntervalSec = existing.CheckIntervalSec
hc.HealthyThreshold = existing.HealthyThreshold
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),
RequestPath: "/my-healthz-path",
Host: "k8s.io",
Description: "My custom HC",
UnhealthyThreshold: 30,
CheckIntervalSec: 40,
}
@ -154,7 +155,8 @@ func TestHealthCheckMigration(t *testing.T) {
if hc.RequestPath != legacyHC.RequestPath ||
hc.Host != legacyHC.Host ||
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)
}
}