Merge pull request #618 from bpickard22/kube-bump

SDN-4404: Kube 1.29 bump

Author: openshift-merge-bot[bot]

go.mod

@@ -65,7 +65,7 @@ type ProxyServer struct {
 	MetricsBindAddress string
 	EnableProfiling    bool
 	ConfigSyncPeriod   time.Duration
-	HealthzServer      healthcheck.ProxierHealthUpdater
+	HealthzServer      *healthcheck.ProxierHealthServer
 
 	// Not in the upstream version
 	baseProxy      sdnproxy.HybridizableProxy
@@ -97,9 +97,9 @@ func newProxyServer(config *kubeproxyconfig.KubeProxyConfiguration, client clien
 		Namespace: "",
 	}
 
-	var healthzServer healthcheck.ProxierHealthUpdater
+	var healthzServer *healthcheck.ProxierHealthServer
 	if len(config.HealthzBindAddress) > 0 {
-		healthzServer = healthcheck.NewProxierHealthServer(config.HealthzBindAddress, 2*config.IPTables.SyncPeriod.Duration, recorder, nodeRef)
+		healthzServer = healthcheck.NewProxierHealthServer(config.HealthzBindAddress, 2*config.IPTables.SyncPeriod.Duration)
 	}
 
 	var proxier sdnproxy.HybridizableProxy
@@ -142,6 +142,7 @@ func newProxyServer(config *kubeproxyconfig.KubeProxyConfiguration, client clien
 			recorder,
 			healthzServer,
 			config.NodePortAddresses,
+			false,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("unable to create proxier: %v", err)
@@ -173,7 +174,7 @@ func newProxyServer(config *kubeproxyconfig.KubeProxyConfiguration, client clien
 
 // serveHealthz runs the healthz server. This is an exact copy of serveHealthz() from
 // k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-func serveHealthz(hz healthcheck.ProxierHealthUpdater, errCh chan error) {
+func serveHealthz(hz *healthcheck.ProxierHealthServer, errCh chan error) {
 	if hz == nil {
 		return
 	}

go.sum

@@ -1,10 +1,11 @@
 package openshift_sdn_node
 
 import (
-	"github.com/spf13/pflag"
 	"net"
 	"time"
 
+	"github.com/spf13/pflag"
+
 	corev1 "k8s.io/api/core/v1"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -135,6 +136,14 @@ func (d *sdnLocalDetector) IfNotLocal() []string {
 	return []string{"!", "-i", sdnnode.Tun0}
 }
 
+func (d *sdnLocalDetector) IfLocalNFT() []string {
+	return nil
+}
+
+func (d *sdnLocalDetector) IfNotLocalNFT() []string {
+	return nil
+}
+
 func getLocalDetector() proxyutiliptables.LocalTrafficDetector {
 	return &sdnLocalDetector{}
 }

pkg/cmd/openshift-sdn-node/kube_proxy.go

@@ -197,7 +197,7 @@ func (eip *egressIPWatcher) runIPAssignmentResync(stopCh <-chan struct{}) {
 
 	subscribeErr := addrSubscribe()
 	if subscribeErr != nil {
-		klog.Error("Error during netlink subscribe: %v", subscribeErr)
+		klog.Errorf("Error during netlink subscribe: %v", subscribeErr)
 	}
 
 	for {
@@ -208,7 +208,7 @@ func (eip *egressIPWatcher) runIPAssignmentResync(stopCh <-chan struct{}) {
 		case a, ok := <-addrChan:
 			if !ok {
 				if subscribeErr = addrSubscribe(); subscribeErr != nil {
-					klog.Error("Error during netlink re-subscribe due to address channel closing: %v", subscribeErr)
+					klog.Errorf("Error during netlink re-subscribe due to address channel closing: %v", subscribeErr)
 					// limit the retry attempts
 					time.Sleep(common.DefaultPollInterval)
 				}

pkg/cmd/openshift-sdn-node/proxy.go

@@ -21,7 +21,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	kubeletapi "k8s.io/cri-api/pkg/apis"
 	kruntimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	ktypes "k8s.io/kubernetes/pkg/kubelet/types"
 	"k8s.io/kubernetes/pkg/util/iptables"
 	kexec "k8s.io/utils/exec"
 
@@ -439,7 +438,7 @@ func (node *OsdnNode) killFailedPods(failed map[string]*kruntimeapi.PodSandbox)
 // See https://github.com/containernetworking/cni/issues/89
 func (node *OsdnNode) UpdatePod(pod corev1.Pod) error {
 	filter := &kruntimeapi.PodSandboxFilter{
-		LabelSelector: map[string]string{ktypes.KubernetesPodUIDLabel: string(pod.UID)},
+		LabelSelector: map[string]string{"io.kubernetes.pod.uid": string(pod.UID)},
 	}
 	sandboxID, err := node.getPodSandboxID(filter)
 	if err != nil {