[Backport release/3.5.x]fix(translator): Add translate threshold in upstream policy translation (#7784)

CHANGELOG.md

@@ -120,6 +120,10 @@ Adding a new version? You'll need three changes:
   [#7751](https://github.com/Kong/kubernetes-ingress-controller/pull/7751)
 - Reject CA Secrets with multiple PEM certs.
   [#7763](https://github.com/Kong/kubernetes-ingress-controller/pull/7763)
+- Translate `healtchchecks.thershold` in `KongUpstreamPolicy` to the
+  `healthchecks.thershold` field in Kong upstreams.
+  (Thanks to [@elbrogan-vizio](https://github.com/elbrogan-vizio) who contributed to the fix.)
+  [#7784](https://github.com/Kong/kubernetes-ingress-controller/pull/7784)
 
 ## [3.5.2]
 

internal/dataplane/kongstate/kongupstreampolicy.go

@@ -171,8 +171,9 @@ func translateHealthchecks(healthchecks *configurationv1beta1.KongUpstreamHealth
 		return nil
 	}
 	return &kong.Healthcheck{
-		Active:  translateActiveHealthcheck(healthchecks.Active),
-		Passive: translatePassiveHealthcheck(healthchecks.Passive),
+		Active:    translateActiveHealthcheck(healthchecks.Active),
+		Passive:   translatePassiveHealthcheck(healthchecks.Passive),
+		Threshold: translateThreshold(healthchecks.Threshold),
 	}
 }
 
@@ -204,6 +205,13 @@ func translatePassiveHealthcheck(healthcheck *configurationv1beta1.KongUpstreamP
 	}
 }
 
+func translateThreshold(threshold *int) *float64 {
+	if threshold == nil {
+		return nil
+	}
+	return lo.ToPtr(float64(*threshold))
+}
+
 func translateHealthy(healthy *configurationv1beta1.KongUpstreamHealthcheckHealthy) *kong.Healthy {
 	if healthy == nil {
 		return nil

internal/dataplane/kongstate/kongupstreampolicy_test.go

@@ -383,7 +383,7 @@ func TestTranslateKongUpstreamPolicy(t *testing.T) {
 							Timeouts:    lo.ToPtr(120),
 						},
 					},
-					Threshold: lo.ToPtr(140),
+					Threshold: lo.ToPtr(15),
 				},
 			},
 			expectedUpstream: &kong.Upstream{
@@ -418,6 +418,7 @@ func TestTranslateKongUpstreamPolicy(t *testing.T) {
 							Timeouts:    lo.ToPtr(120),
 						},
 					},
+					Threshold: lo.ToPtr(15.0),
 				},
 			},
 		},

test/kongintegration/kongupstreampolicy_test.go

@@ -175,7 +175,7 @@ func TestKongUpstreamPolicyTranslation(t *testing.T) {
 							Timeouts:     lo.ToPtr(120),
 						},
 					},
-					Threshold: lo.ToPtr(140),
+					Threshold: lo.ToPtr(10),
 				},
 			},
 			expectedUpstream: &kong.Upstream{
@@ -214,7 +214,7 @@ func TestKongUpstreamPolicyTranslation(t *testing.T) {
 							Timeouts:     lo.ToPtr(120),
 						},
 					},
-					Threshold: lo.ToPtr(0.),
+					Threshold: lo.ToPtr(10.0),
 				},
 			},
 		},