Skip to content

Commit 21283df

Browse files
authored
Merge pull request #57 from Kong/feat/fix-healthcheck
Fix health check errors
2 parents d70bae6 + 789662d commit 21283df

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

internal/ingress/controller/kong.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,11 +897,26 @@ func (n *NGINXController) syncUpstreams(locations []*ingress.Location, backends
897897
if kongIngress.Upstream.Healthchecks != nil {
898898
if kongIngress.Upstream.Healthchecks.Active != nil {
899899
m := structs.Map(kongIngress.Upstream.Healthchecks.Active)
900+
if upstream.Healthchecks == nil {
901+
upstream.Healthchecks = &kongadminv1.Healthchecks{}
902+
}
903+
if upstream.Healthchecks.Active == nil {
904+
upstream.Healthchecks.Active = &kongadminv1.ActiveHealthCheck{}
905+
}
906+
900907
mergo.MapWithOverwrite(upstream.Healthchecks.Active, m)
901908
}
902909

903910
if kongIngress.Upstream.Healthchecks.Passive != nil {
904911
m := structs.Map(kongIngress.Upstream.Healthchecks.Passive)
912+
913+
if upstream.Healthchecks == nil {
914+
upstream.Healthchecks = &kongadminv1.Healthchecks{}
915+
}
916+
if upstream.Healthchecks.Passive == nil {
917+
upstream.Healthchecks.Passive = &kongadminv1.Passive{}
918+
}
919+
905920
mergo.MapWithOverwrite(upstream.Healthchecks.Passive, m)
906921
}
907922
}

0 commit comments

Comments
 (0)