Fix empty probe failures for Knative (#703)

halim-lee · web-flow · commit d3827b10fc11 · 2025-11-12T14:26:57.000-05:00
Fixes WASdev/websphere-liberty-operator#400
diff --git a/utils/utils.go b/utils/utils.go
@@ -987,28 +987,19 @@ func CustomizeKnativeService(ksvc *servingv1.Service, ba common.BaseComponent) {
 
 	if ksvc.Spec.Template.Spec.Containers[0].LivenessProbe != nil {
 		if ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet != nil {
-			ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet.Port = intstr.IntOrString{}
-		}
-		if ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.TCPSocket != nil {
-			ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.TCPSocket.Port = intstr.IntOrString{}
+			ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet.Scheme = ""
 		}
 	}
 
 	if ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe != nil {
 		if ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet != nil {
-			ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Port = intstr.IntOrString{}
-		}
-		if ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.TCPSocket != nil {
-			ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.TCPSocket.Port = intstr.IntOrString{}
+			ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Scheme = ""
 		}
 	}
 
 	if ksvc.Spec.Template.Spec.Containers[0].StartupProbe != nil {
 		if ksvc.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet != nil {
-			ksvc.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet.Port = intstr.IntOrString{}
-		}
-		if ksvc.Spec.Template.Spec.Containers[0].StartupProbe.TCPSocket != nil {
-			ksvc.Spec.Template.Spec.Containers[0].StartupProbe.TCPSocket.Port = intstr.IntOrString{}
+			ksvc.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet.Scheme = ""
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -987,28 +987,19 @@ func CustomizeKnativeService(ksvc *servingv1.Service, ba common.BaseComponent) {`
`987`	`987`
`988`	`988`	`if ksvc.Spec.Template.Spec.Containers[0].LivenessProbe != nil {`
`989`	`989`	`if ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet != nil {`
`990`		`- ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet.Port = intstr.IntOrString{}`
`991`		`- }`
`992`		`- if ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.TCPSocket != nil {`
`993`		`- ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.TCPSocket.Port = intstr.IntOrString{}`
	`990`	`+ ksvc.Spec.Template.Spec.Containers[0].LivenessProbe.HTTPGet.Scheme = ""`
`994`	`991`	`}`
`995`	`992`	`}`
`996`	`993`
`997`	`994`	`if ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe != nil {`
`998`	`995`	`if ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet != nil {`
`999`		`- ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Port = intstr.IntOrString{}`
`1000`		`- }`
`1001`		`- if ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.TCPSocket != nil {`
`1002`		`- ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.TCPSocket.Port = intstr.IntOrString{}`
	`996`	`+ ksvc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Scheme = ""`
`1003`	`997`	`}`
`1004`	`998`	`}`
`1005`	`999`
`1006`	`1000`	`if ksvc.Spec.Template.Spec.Containers[0].StartupProbe != nil {`
`1007`	`1001`	`if ksvc.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet != nil {`
`1008`		`- ksvc.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet.Port = intstr.IntOrString{}`
`1009`		`- }`
`1010`		`- if ksvc.Spec.Template.Spec.Containers[0].StartupProbe.TCPSocket != nil {`
`1011`		`- ksvc.Spec.Template.Spec.Containers[0].StartupProbe.TCPSocket.Port = intstr.IntOrString{}`
	`1002`	`+ ksvc.Spec.Template.Spec.Containers[0].StartupProbe.HTTPGet.Scheme = ""`
`1012`	`1003`	`}`
`1013`	`1004`	`}`
`1014`	`1005`