Merge branch 'main' into dependabot/github_actions/actions-4f42b3d729

jjngx · web-flow · commit df7413ec1f61 · 2024-09-13T19:19:39.000+01:00
diff --git a/internal/k8s/service.go b/internal/k8s/service.go
@@ -5,7 +5,6 @@ import (
 	"sort"
 
 	"github.com/golang/glog"
-	api_v1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 )
@@ -147,7 +146,7 @@ func (lbc *LoadBalancerController) syncService(task task) {
 			lbc.statusUpdater.ClearStatusFromExternalService()
 		} else {
 			// service added or updated
-			lbc.statusUpdater.SaveStatusFromExternalService(obj.(*api_v1.Service))
+			lbc.statusUpdater.SaveStatusFromExternalService(obj.(*v1.Service))
 		}
 
 		if lbc.reportStatusEnabled() {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import (`
`5`	`5`	`"sort"`
`6`	`6`
`7`	`7`	`"github.com/golang/glog"`
`8`		`- api_v1 "k8s.io/api/core/v1"`
`9`	`8`	`v1 "k8s.io/api/core/v1"`
`10`	`9`	`"k8s.io/client-go/tools/cache"`
`11`	`10`	`)`
`@@ -147,7 +146,7 @@ func (lbc *LoadBalancerController) syncService(task task) {`
`147`	`146`	`lbc.statusUpdater.ClearStatusFromExternalService()`
`148`	`147`	`} else {`
`149`	`148`	`// service added or updated`
`150`		`- lbc.statusUpdater.SaveStatusFromExternalService(obj.(*api_v1.Service))`
	`149`	`+ lbc.statusUpdater.SaveStatusFromExternalService(obj.(*v1.Service))`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`if lbc.reportStatusEnabled() {`