Merge pull request #629 from danwinship/art-update

openshift-merge-bot[bot] · web-flow · commit 0717dc14331b · 2024-06-13T16:22:02.000Z
OCPBUGS-34279: ART sync and golang 1.22 update
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.21-openshift-4.17
+  tag: rhel-9-release-golang-1.22-openshift-4.17
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/sdn
 
-go 1.21
+go 1.22
 
 require (
 	github.com/containernetworking/cni v0.8.1
diff --git a/images/kube-proxy/Dockerfile.rhel b/images/kube-proxy/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
 WORKDIR /go/src/github.com/openshift/sdn
 COPY . .
 RUN make build --warn-undefined-variables
diff --git a/pkg/network/node/node.go b/pkg/network/node/node.go
@@ -381,7 +381,7 @@ func (node *OsdnNode) reattachPods(existingPodSandboxes map[string]*kruntimeapi.
 		return err
 	}
 	start := time.Now()
-	defer klog.V(2).Infof("reattachPods took %v", time.Since(start))
+	defer func() { klog.V(2).Infof("reattachPods took %v", time.Since(start)) }()
 	node.podManager.setReattachPodsCache(pods)
 	for sandboxID, podInfo := range existingOFPodNetworks {
 		sandbox, ok := existingPodSandboxes[sandboxID]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder`
`2`	`2`	`WORKDIR /go/src/github.com/openshift/sdn`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN make build --warn-undefined-variables`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ func (node OsdnNode) reattachPods(existingPodSandboxes map[string]kruntimeapi.`
`381`	`381`	`return err`
`382`	`382`	`}`
`383`	`383`	`start := time.Now()`
`384`		`- defer klog.V(2).Infof("reattachPods took %v", time.Since(start))`
	`384`	`+ defer func() { klog.V(2).Infof("reattachPods took %v", time.Since(start)) }()`
`385`	`385`	`node.podManager.setReattachPodsCache(pods)`
`386`	`386`	`for sandboxID, podInfo := range existingOFPodNetworks {`
`387`	`387`	`sandbox, ok := existingPodSandboxes[sandboxID]`