bump k8s to v1.27.13

Makefile

@@ -1,7 +1,5 @@
 SHELL = /bin/bash
 
-include Makefile.e2e
-
 REGISTRY = kubeovn
 DEV_TAG = dev
 RELEASE_TAG = $(shell cat VERSION)
@@ -584,6 +582,11 @@ ipam-bench:
 	go test -timeout 30m -bench='^BenchmarkIPAM' -benchtime=10000x test/unittest/ipam_bench/ipam_test.go -args -logtostderr=false
 	go test -timeout 90m -bench='^BenchmarkParallelIPAM' -benchtime=10x test/unittest/ipam_bench/ipam_test.go -args -logtostderr=false
 
+.PHONY: kubectl-ko-log
+kubectl-ko-log:
+	kubectl ko log all
+	tar -zcvf kubectl-ko-log.tar.gz kubectl-ko-log/
+
 .PHONY: clean
 clean:
 	$(RM) dist/images/kube-ovn dist/images/kube-ovn-cmd

cmd/daemon/cniserver.go

@@ -59,7 +59,7 @@ func CmdMain() {
 		util.LogFatalAndExit(err, "failed to initialize node gateway")
 	}
 
-	stopCh := signals.SetupSignalHandler()
+	stopCh := signals.SetupSignalHandler().Done()
 	podInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(config.KubeClient, 0,
 		kubeinformers.WithTweakListOptions(func(listOption *v1.ListOptions) {
 			listOption.FieldSelector = fmt.Sprintf("spec.nodeName=%s", config.NodeName)

cmd/ovn_ic_controller/ovn_ic_controller.go

@@ -18,7 +18,7 @@ func CmdMain() {
 		util.LogFatalAndExit(err, "failed to parse config")
 	}
 
-	stopCh := signals.SetupSignalHandler()
+	stopCh := signals.SetupSignalHandler().Done()
 	ctl := ovn_ic_controller.NewController(config)
 	ctl.Run(stopCh)
 }

cmd/speaker/speaker.go

@@ -23,7 +23,7 @@ func CmdMain() {
 		util.LogFatalAndExit(err, "failed to parse config")
 	}
 
-	stopCh := signals.SetupSignalHandler()
+	stopCh := signals.SetupSignalHandler().Done()
 	ctl := speaker.NewController(config)
 
 	go func() {

cmd/webhook/server.go

@@ -39,10 +39,9 @@ func init() {
 }
 
 func main() {
-	var port int
 	klog.Infof(versions.String())
 
-	port = *pflag.Int("port", 8443, "The port webhook listen on.")
+	port := pflag.Int("port", 8443, "The port webhook listen on.")
 
 	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
 	klog.InitFlags(klogFlags)
@@ -66,10 +65,10 @@ func main() {
 	ctrl.SetLogger(klogr.New())
 
 	// Create a webhook server.
-	hookServer := &ctrlwebhook.Server{
-		Port:    port,
+	hookServer := ctrlwebhook.NewServer(ctrlwebhook.Options{
+		Port:    *port,
 		CertDir: hookServerCertDir,
-	}
+	})
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme: scheme,

dist/images/Dockerfile.base

@@ -82,7 +82,7 @@ FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update && apt upgrade -y && apt install ca-certificates python3 hostname libunwind8 netbase \
-        ethtool iproute2 ncat libunbound-dev procps libatomic1 kmod iptables \
+        ethtool iproute2 ncat libunbound8 procps libatomic1 kmod iptables \
         tcpdump ipset curl uuid-runtime openssl inetutils-ping iputils-tracepath arping ndisc6 \
         logrotate dnsutils net-tools strongswan strongswan-pki libcharon-extra-plugins \
         libcharon-extauth-plugins libstrongswan-extra-plugins libstrongswan-standard-plugins -y --no-install-recommends && \
@@ -95,10 +95,10 @@ RUN mkdir -p /var/run/openvswitch && \
     mkdir -p /opt/cni/bin
 
 ARG ARCH
-ENV CNI_VERSION=v1.3.0
+ENV CNI_VERSION=v1.4.1
 RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan
 
-ENV KUBE_VERSION="v1.28.8"
+ENV KUBE_VERSION="v1.28.9"
 
 RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \
  && chmod +x /usr/bin/kubectl && rm -rf ./kubernetes