bump k8s to v1.30.3 (#4317)

Signed-off-by: zhangzujian <[email protected]>

Makefile

@@ -34,7 +34,7 @@ METALLB_CONTROLLER_IMAGE = quay.io/metallb/controller:v$(METALLB_VERSION)
 METALLB_SPEAKER_IMAGE = quay.io/metallb/speaker:v$(METALLB_VERSION)
 METALLB_FRR_IMAGE = quay.io/frrouting/frr:8.5.2
 
-KUBEVIRT_VERSION = v0.59.2
+KUBEVIRT_VERSION = v1.3.0
 KUBEVIRT_OPERATOR_IMAGE = quay.io/kubevirt/virt-operator:$(KUBEVIRT_VERSION)
 KUBEVIRT_API_IMAGE = quay.io/kubevirt/virt-api:$(KUBEVIRT_VERSION)
 KUBEVIRT_CONTROLLER_IMAGE = quay.io/kubevirt/virt-controller:$(KUBEVIRT_VERSION)
@@ -869,7 +869,7 @@ lint:
 	@GOOS=linux gosec -exclude=G204,G301,G306,G402,G404,G601 -exclude-dir=test -exclude-dir=pkg/client ./...
 
 .PHONY: gofumpt
-gofumpt: gofumpt
+gofumpt:
 	gofumpt -w -extra .
 
 .PHONY: lint-windows

cmd/cni/cni.go

@@ -25,8 +25,12 @@ func main() {
 	// must ensure that the goroutine does not jump from OS thread to thread
 	runtime.LockOSThread()
 
+	funcs := skel.CNIFuncs{
+		Add: cmdAdd,
+		Del: cmdDel,
+	}
 	about := fmt.Sprintf("CNI kube-ovn plugin %s", versions.VERSION)
-	skel.PluginMain(cmdAdd, nil, cmdDel, version.All, about)
+	skel.PluginMainFuncs(funcs, version.All, about)
 }
 
 func cmdAdd(args *skel.CmdArgs) error {

cmd/webhook/server.go

@@ -9,9 +9,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	ovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
@@ -61,7 +61,7 @@ func main() {
 	pflag.Parse()
 
 	// set logger for controller-runtime framework
-	ctrl.SetLogger(klogr.New())
+	ctrl.SetLogger(klog.NewKlogr())
 
 	// Create a webhook server.
 	hookServer := ctrlwebhook.NewServer(ctrlwebhook.Options{
@@ -72,7 +72,9 @@ func main() {
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme: scheme,
 		// disable metrics to avoid port conflict
-		MetricsBindAddress:     "0",
+		Metrics: server.Options{
+			BindAddress: "0",
+		},
 		HealthProbeBindAddress: util.JoinHostPort(os.Getenv("POD_IP"), *healthProbePort),
 	})
 	if err != nil {

hack/update-codegen-docker.sh

@@ -4,14 +4,12 @@
 # set GOPROXY you like
 GOPROXY="https://goproxy.cn"
 
-PROJECT_PACKAGE=github.com/kubeovn/kube-ovn
 docker run -it --rm \
-    -v ${PWD}:/go/src/${PROJECT_PACKAGE}\
-    -v ${PWD}/hack/boilerplate.go.txt:/tmp/fake-boilerplate.txt \
-    -e PROJECT_PACKAGE=${PROJECT_PACKAGE} \
-    -e CLIENT_GENERATOR_OUT=${PROJECT_PACKAGE}/pkg/client \
-    -e APIS_ROOT=${PROJECT_PACKAGE}/pkg/apis \
-    -e GROUPS_VERSION="kubeovn:v1" \
-    -e GENERATION_TARGETS="deepcopy,client,informer,lister" \
+    -v ${PWD}:/app \
     -e GOPROXY=${GOPROXY} \
-    quay.io/slok/kube-code-generator:v1.26.0
+    ghcr.io/zhangzujian/kube-code-generator:v0.2.1 \
+    --boilerplate-path ./hack/boilerplate.go.txt \
+    --apis-in ./pkg/apis \
+    --go-gen-out ./pkg/client
+
+go mod tidy