Jsonify description of healthchecks from THC

kubernetes · May 4, 2023 · 878e6d7 · 878e6d7
1 parent 2bf2aa0
commit 878e6d7
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 14 deletions.
diff --git a/pkg/healthchecks/healthchecks.go b/pkg/healthchecks/healthchecks.go
@@ -89,7 +89,7 @@ func (h *HealthChecks) new(sp utils.ServicePort) *translator.HealthCheck {
 	}
 	hc.Name = sp.BackendName()
 	hc.Service = h.getService(sp)
-	hc.SetHealthcheckInfo(h.generateHealthcheckInfo(sp, hc.ForILB))
+	hc.SetHealthcheckInfo(h.generateClusterServiceInfo(sp, hc.ForILB))
 	return hc
 }
 
@@ -114,17 +114,13 @@ func (h *HealthChecks) mainService(sp utils.ServicePort) types.NamespacedName {
 	return service
 }
 
-func (h *HealthChecks) generateHealthcheckInfo(sp utils.ServicePort, iLB bool) healthcheck.HealthcheckInfo {
+func (h *HealthChecks) generateClusterServiceInfo(sp utils.ServicePort, iLB bool) (healthcheck.ClusterInfo, healthcheck.ServiceInfo) {
 	serviceInfo := healthcheck.ServiceInfo(h.defaultBackendSvc)
 	if sp.ID.Service.Name != "" {
 		serviceInfo = healthcheck.ServiceInfo(sp.ID.Service)
 	}
 
-	return healthcheck.HealthcheckInfo{
-		ClusterInfo:       h.clusterInfo,
-		ServiceInfo:       serviceInfo,
-		HealthcheckConfig: healthcheck.DefaultHC,
-	}
+	return h.clusterInfo, serviceInfo
 }
 
 // SyncServicePort implements HealthChecker.

diff --git a/pkg/healthchecks/healthchecks_test.go b/pkg/healthchecks/healthchecks_test.go
@@ -1021,7 +1021,7 @@ func (*syncSPFixture) thc() *compute.HealthCheck {
 			Port:              7877,
 			RequestPath:       "/api/podhealth",
 		},
-		Description: translator.DescriptionForTransparentHealthChecks, //TODO(DamianSawicki): JSONify.
+		Description: translator.DescriptionForTransparentHealthChecks,
 	}
 }
 
@@ -1202,6 +1202,18 @@ func TestSyncServicePort(t *testing.T) {
 		wantComputeHC: chc,
 	})
 
+	// Transparent Health Check (ILB), regional cluster
+	chc = fixture.thc()
+	toIlb(chc)
+	cases = append(cases, &tc{
+		desc:            "create thc ilb regional cluster",
+		sp:              testSPs["HTTP-80-ilb-nil-thc"],
+		enableTHC:       true,
+		regional:        true,
+		regionalCluster: true,
+		wantComputeHC:   chc,
+	})
+
 	// Probe ignored with THC
 	chc = fixture.thc()
 	cases = append(cases, &tc{
@@ -1435,6 +1447,15 @@ func TestSyncServicePort(t *testing.T) {
 		wantComputeHC: w,
 		enableTHC:     true,
 	})
+	cases = append(cases, &tc{
+		desc:            "update ilb to thc regional cluster",
+		setup:           fixture.setupExistingHCFunc(fixture.ilb()),
+		sp:              testSPs["HTTP-80-ilb-nil-thc"],
+		regional:        true,
+		regionalCluster: true,
+		wantComputeHC:   w,
+		enableTHC:       true,
+	})
 
 	// Preserve user settings.
 	chc = fixture.hc()
@@ -1573,7 +1594,11 @@ func TestSyncServicePort(t *testing.T) {
 		tc.updateHCDescription = true
 		tc.desc = tc.desc + " with updateHCDescription"
 		copyOfWant := *tc.wantComputeHC
-		if tc.sp.BackendConfig != nil {
+		if tc.sp.BackendConfig != nil || tc.sp.THCEnabled == true {
+			config := healthcheck.TransparentHC
+			if tc.sp.BackendConfig != nil {
+				config = healthcheck.BackendConfigHC
+			}
 			var wantLocation string
 			if tc.regionalCluster {
 				wantLocation = gce.DefaultTestClusterValues().Region
@@ -1583,7 +1608,7 @@ func TestSyncServicePort(t *testing.T) {
 			wantDesc := healthcheck.HealthcheckDesc{
 				K8sCluster:  fmt.Sprintf("/locations/%s/clusters/%s", wantLocation, gce.DefaultTestClusterValues().ClusterName),
 				K8sResource: fmt.Sprintf("/namespaces/%s/services/%s", defaultBackendSvc.Namespace, defaultBackendSvc.Name),
-				Config:      "BackendConfig",
+				Config:      config,
 			}
 			bytes, err := json.MarshalIndent(wantDesc, "", "    ")
 			if err != nil {

diff --git a/pkg/translator/healthchecks.go b/pkg/translator/healthchecks.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
+	"golang.org/x/exp/slices"
 	computealpha "google.golang.org/api/compute/v0.alpha"
 	computebeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/compute/v1"
@@ -106,13 +107,15 @@ type HealthCheck struct {
 	healthcheckInfo healthcheck.HealthcheckInfo
 }
 
-func (hc *HealthCheck) SetHealthcheckInfo(i healthcheck.HealthcheckInfo) {
-	hc.healthcheckInfo = i
+func (hc *HealthCheck) SetHealthcheckInfo(ci healthcheck.ClusterInfo, si healthcheck.ServiceInfo) {
+	hc.healthcheckInfo.ClusterInfo = ci
+	hc.healthcheckInfo.ServiceInfo = si
 	hc.reconcileHCDescription()
 }
 
 func (hc *HealthCheck) reconcileHCDescription() {
-	if flags.F.EnableUpdateCustomHealthCheckDescription && hc.healthcheckInfo.HealthcheckConfig == healthcheck.BackendConfigHC {
+	if flags.F.EnableUpdateCustomHealthCheckDescription &&
+		slices.Contains([]healthcheck.HealthcheckConfig{healthcheck.BackendConfigHC, healthcheck.TransparentHC}, hc.healthcheckInfo.HealthcheckConfig) {
 		hc.Description = hc.healthcheckInfo.GenerateHealthcheckDescription()
 	}
 }
@@ -236,6 +239,8 @@ func OverwriteWithTHC(hc *HealthCheck) {
 	hc.PortSpecification = thcPortSpecification
 	hc.Port = THCPort
 	hc.RequestPath = thcRequestPath
+	hc.healthcheckInfo.HealthcheckConfig = healthcheck.TransparentHC
+	hc.reconcileHCDescription()
 }
 
 func (hc *HealthCheck) UpdateFromBackendConfig(c *backendconfigv1.HealthCheckConfig) {

diff --git a/pkg/translator/healthchecks_test.go b/pkg/translator/healthchecks_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/kr/pretty"
 	computealpha "google.golang.org/api/compute/v0.alpha"
 	"k8s.io/ingress-gce/pkg/annotations"
+	"k8s.io/ingress-gce/pkg/utils/healthcheck"
 )
 
 func TestMerge(t *testing.T) {
@@ -89,6 +90,7 @@ func TestMerge(t *testing.T) {
 
 func TestOverwriteWithTHC(t *testing.T) {
 	wantHC := &HealthCheck{
+		ForNEG: true,
 		HealthCheck: computealpha.HealthCheck{
 			CheckIntervalSec:   5,
 			TimeoutSec:         5,
@@ -102,9 +104,14 @@ func TestOverwriteWithTHC(t *testing.T) {
 			PortSpecification: "USE_FIXED_PORT",
 			RequestPath:       "/api/podhealth",
 		},
+		healthcheckInfo: healthcheck.HealthcheckInfo{
+			HealthcheckConfig: healthcheck.TransparentHC,
+		},
 	}
 
-	hc := &HealthCheck{}
+	hc := &HealthCheck{
+		ForNEG: true,
+	}
 	OverwriteWithTHC(hc)
 	if !reflect.DeepEqual(hc, wantHC) {
 		t.Fatalf("Translate healthcheck is:\n%s, want:\n%s", pretty.Sprint(hc), pretty.Sprint(wantHC))

diff --git a/pkg/utils/healthcheck/healthcheckdesc.go b/pkg/utils/healthcheck/healthcheckdesc.go
@@ -39,6 +39,7 @@ const (
 	DefaultHC        HealthcheckConfig = "Default"
 	ReadinessProbeHC HealthcheckConfig = "ReadinessProbe"
 	BackendConfigHC  HealthcheckConfig = "BackendConfig"
+	TransparentHC    HealthcheckConfig = "TransparentHC"
 )
 
 type HealthcheckInfo struct {