Merge pull request #1237 from dannyzaken/danny-5.11

dannyzaken · web-flow · commit 8e38c89f2883 · 2023-11-01T23:48:29.000-07:00
[Backport to 5.11] BugFix - [MCG] RPC method "list_objects" fails with "RPC: object.list_objects() Call failed: failed to WebSocket dial"
diff --git a/pkg/nb/router.go b/pkg/nb/router.go
@@ -199,9 +199,6 @@ func FindPortByName(srv *corev1.Service, portName string) *corev1.ServicePort {
 
 // GetAPIPortName maps every noobaa api name to the service port name that serves it.
 func GetAPIPortName(api string) string {
-	if api == "object_api" || api == "func_api" {
-		return "md-https"
-	}
 	if api == "scrubber_api" {
 		return "bg-https"
 	}

Original file line number	Diff line number	Diff line change
`@@ -199,9 +199,6 @@ func FindPortByName(srv corev1.Service, portName string) corev1.ServicePort {`
`199`	`199`
`200`	`200`	`// GetAPIPortName maps every noobaa api name to the service port name that serves it.`
`201`	`201`	`func GetAPIPortName(api string) string {`
`202`		`- if api == "object_api" \|\| api == "func_api" {`
`203`		`- return "md-https"`
`204`		`- }`
`205`	`202`	`if api == "scrubber_api" {`
`206`	`203`	`return "bg-https"`
`207`	`204`	`}`