Skip to content

Commit 5293c42

Browse files
author
Ying Wang
committed
modify Docker iamge
Signed-off-by: Ying Wang <yingwang@rehat.com>
1 parent ab23f23 commit 5293c42

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.24-openshift-4.21
4+
tag: rhel-9-release-golang-1.25-openshift-4.22

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-network-operator
33
COPY . .
44
RUN hack/build-go.sh
55

6-
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
6+
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
77
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/cluster-network-operator /usr/bin/
88
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/cluster-network-check-endpoints /usr/bin/
99
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/cluster-network-check-target /usr/bin/

manifests/0000_70_cluster-network-operator_01_pki_crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.19.0
7+
controller-gen.kubebuilder.io/version: v0.20.0
88
include.release.openshift.io/ibm-cloud-managed: "true"
99
include.release.openshift.io/self-managed-high-availability: "true"
1010
name: operatorpkis.network.operator.openshift.io

pkg/network/mtu.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ package network
55

66
import (
77
"fmt"
8+
89
"github.com/pkg/errors"
910
"github.com/vishvananda/netlink"
11+
"github.com/vishvananda/netlink/nl"
1012
)
1113

1214
const (
@@ -19,7 +21,7 @@ const (
1921
func GetDefaultMTU() (int, error) {
2022
// Get the interface with the default route
2123
// TODO(cdc) handle v6-only nodes
22-
routes, err := netlink.RouteList(nil, netlink.FAMILY_ALL)
24+
routes, err := netlink.RouteList(nil, nl.FAMILY_ALL)
2325
if err != nil {
2426
return 0, errors.Wrapf(err, "could not list routes")
2527
}

0 commit comments

Comments
 (0)