Skip to content

Commit

Permalink
bump k8s to v1.26 (#2152)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangzujian
zhangzujian committed Dec 12, 2022
1 parent a4a8b5a commit 207a52c
Show file tree
Hide file tree
Showing 106 changed files with 335 additions and 9,982 deletions.
2 changes: 1 addition & 1 deletion cmd/controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func CmdMain() {
ReadHeaderTimeout: 3 * time.Second,
Handler: mux,
}
klog.Fatal(server.ListenAndServe())
util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and server on %s", server.Addr)
}()

ctl := controller.NewController(config)
Expand Down
4 changes: 2 additions & 2 deletions cmd/daemon/cniserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func CmdMain() {
klog.Infof(versions.String())

if err := initForOS(); err != nil {
klog.Fatal(err)
util.LogFatalAndExit(err, "failed to do the OS initialization")
}

nicBridgeMappings, err := daemon.InitOVSBridges()
Expand Down Expand Up @@ -102,7 +102,7 @@ func CmdMain() {
ReadHeaderTimeout: 3 * time.Second,
Handler: mux,
}
klog.Fatal(server.ListenAndServe())
util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and serve on %s", server.Addr)
}

func mvCNIConf(configDir, configFile, confName string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ovn_monitor/ovn_monitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ func CmdMain() {
Addr: config.ListenAddress,
ReadHeaderTimeout: 3 * time.Second,
}
klog.Fatal(server.ListenAndServe())
util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and server on %s", config.ListenAddress)
}
2 changes: 1 addition & 1 deletion cmd/pinger/pinger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func CmdMain() {
Addr: fmt.Sprintf("0.0.0.0:%d", config.Port),
ReadHeaderTimeout: 3 * time.Second,
}
klog.Fatal(server.ListenAndServe())
util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and serve on %s", server.Addr)
}()
}
e := pinger.NewExporter(config)
Expand Down
2 changes: 1 addition & 1 deletion cmd/speaker/speaker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func CmdMain() {
Addr: fmt.Sprintf("0.0.0.0:%d", config.PprofPort),
ReadHeaderTimeout: 3 * time.Second,
}
klog.Fatal(server.ListenAndServe())
util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and serve on %s", server.Addr)
}()

ctl.Run(stopCh)
Expand Down
81 changes: 42 additions & 39 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/moby/sys/mountinfo v0.6.2
github.com/neverlee/keymutex v0.0.0-20171121013845-f593aa834bf9
github.com/oilbeater/go-ping v0.0.0-20200413021620-332b7197c5b5
github.com/onsi/ginkgo/v2 v2.5.1
github.com/onsi/ginkgo/v2 v2.6.0
github.com/onsi/gomega v1.24.1
github.com/osrg/gobgp/v3 v3.9.0
github.com/ovn-org/libovsdb v0.0.0-20221101143603-8f21d188c3a5
Expand All @@ -32,25 +32,26 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.1
github.com/vishvananda/netlink v1.2.1-beta.2
golang.org/x/exp v0.0.0-20221208044002-44028be4359e
golang.org/x/exp v0.0.0-20221211140036-ad323defaf05
golang.org/x/sys v0.3.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
gopkg.in/k8snetworkplumbingwg/multus-cni.v3 v3.9.2
k8s.io/api v0.25.5
k8s.io/apimachinery v0.25.5
k8s.io/api v0.26.0
k8s.io/apimachinery v0.26.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.80.1
k8s.io/kubernetes v1.25.4
k8s.io/sample-controller v0.25.5
k8s.io/kubernetes v1.26.0
k8s.io/sample-controller v0.26.0
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
kubevirt.io/client-go v0.58.0
sigs.k8s.io/controller-runtime v0.13.1
sigs.k8s.io/controller-runtime v0.0.0-20221211125314-222fb669e109
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cenk/hub v1.0.1 // indirect
github.com/cenkalti/hub v1.0.1 // indirect
Expand Down Expand Up @@ -146,13 +147,13 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.25.4 // indirect
k8s.io/apiserver v0.25.4 // indirect
k8s.io/cluster-bootstrap v0.25.4 // indirect
k8s.io/component-base v0.25.4 // indirect
k8s.io/component-helpers v0.25.4 // indirect
k8s.io/apiextensions-apiserver v0.26.0 // indirect
k8s.io/apiserver v0.26.0 // indirect
k8s.io/cluster-bootstrap v0.26.0 // indirect
k8s.io/component-base v0.26.0 // indirect
k8s.io/component-helpers v0.26.0 // indirect
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
k8s.io/kube-proxy v0.25.4 // indirect
k8s.io/kube-proxy v0.26.0 // indirect
kubevirt.io/api v0.58.0 // indirect
kubevirt.io/containerized-data-importer-api v1.55.1 // indirect
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
Expand All @@ -165,33 +166,35 @@ require (
replace (
github.com/alauda/felix => github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139
github.com/greenpau/ovsdb => github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221107163225-3335a34a1d24
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20221208095821-f8830e1998e8
gopkg.in/k8snetworkplumbingwg/multus-cni.v3 => github.com/k8snetworkplumbingwg/multus-cni v0.0.0-20220818150730-3d9cec4ec9d5
k8s.io/api => k8s.io/api v0.25.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.4
k8s.io/apimachinery => k8s.io/apimachinery v0.25.4
k8s.io/apiserver => k8s.io/apiserver v0.25.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.4
k8s.io/client-go => k8s.io/client-go v0.25.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.4
k8s.io/code-generator => k8s.io/code-generator v0.25.4
k8s.io/component-base => k8s.io/component-base v0.25.4
k8s.io/component-helpers => k8s.io/component-helpers v0.25.4
k8s.io/controller-manager => k8s.io/controller-manager v0.25.4
k8s.io/cri-api => k8s.io/cri-api v0.25.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.4
k8s.io/kubectl => k8s.io/kubectl v0.25.4
k8s.io/kubelet => k8s.io/kubelet v0.25.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.4
k8s.io/metrics => k8s.io/metrics v0.25.4
k8s.io/mount-utils => k8s.io/mount-utils v0.25.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.4
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20221124062348-dc7672cf3995
k8s.io/api => k8s.io/api v0.26.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
k8s.io/apiserver => k8s.io/apiserver v0.26.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
k8s.io/client-go => k8s.io/client-go v0.26.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
k8s.io/code-generator => k8s.io/code-generator v0.26.0
k8s.io/component-base => k8s.io/component-base v0.26.0
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
k8s.io/cri-api => k8s.io/cri-api v0.26.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
k8s.io/kubectl => k8s.io/kubectl v0.26.0
k8s.io/kubelet => k8s.io/kubelet v0.26.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
k8s.io/metrics => k8s.io/metrics v0.26.0
k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20221209084839-9c2ed1f0604d
)
Loading

0 comments on commit 207a52c

Please sign in to comment.