Skip to content

Commit 70cefcd

Browse files
danwinshipdanwinship
committed
Revendor k/k to upstream 1.30.3
With this change, openshift-sdn no longer builds.
1 parent 0717dc1 commit 70cefcd

File tree

1,172 files changed

+59796
-22832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,172 files changed

+59796
-22832
lines changed

‎go.mod

Lines changed: 35 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/openshift/sdn
22

3-
go 1.22
3+
go 1.22.0
44

55
require (
66
github.com/containernetworking/cni v0.8.1
77
github.com/containernetworking/plugins v0.6.0
88
github.com/fsnotify/fsnotify v1.7.0
99
github.com/gorilla/mux v1.8.0
1010
github.com/miekg/dns v1.1.35
11-
github.com/opencontainers/runc v1.1.10
11+
github.com/opencontainers/runc v1.1.12
1212
github.com/openshift/api v0.0.0-20231010075512-1ccc6058c62d
1313
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
1414
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
@@ -18,18 +18,18 @@ require (
1818
github.com/spf13/pflag v1.0.5
1919
github.com/vishvananda/netlink v1.1.0
2020
go.opentelemetry.io/otel/trace v1.19.0
21-
golang.org/x/sys v0.13.0
22-
k8s.io/api v1.29.1
23-
k8s.io/apimachinery v1.29.1
24-
k8s.io/apiserver v1.29.1
25-
k8s.io/client-go v1.29.1
26-
k8s.io/cloud-provider v0.0.0
27-
k8s.io/component-base v1.29.1
28-
k8s.io/component-helpers v0.0.0
29-
k8s.io/cri-api v1.29.1
30-
k8s.io/klog/v2 v2.110.1
31-
k8s.io/kubernetes v1.29.1 // actual branch sdn-4.16-kubernetes-1.29 in openshift/kubernetes
32-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
21+
golang.org/x/sys v0.18.0
22+
k8s.io/api v0.30.3
23+
k8s.io/apimachinery v0.30.3
24+
k8s.io/apiserver v0.30.3
25+
k8s.io/client-go v0.30.3
26+
k8s.io/cloud-provider v0.30.3
27+
k8s.io/component-base v0.30.3
28+
k8s.io/component-helpers v0.30.3
29+
k8s.io/cri-api v0.30.3
30+
k8s.io/klog/v2 v2.130.1
31+
k8s.io/kubernetes v1.30.3
32+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3333
sigs.k8s.io/knftables v0.0.16
3434
sigs.k8s.io/yaml v1.3.0
3535
)
@@ -49,24 +49,23 @@ require (
4949
github.com/coreos/go-semver v0.3.1 // indirect
5050
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5151
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
52-
github.com/danwinship/knftables v0.0.13 // indirect
5352
github.com/davecgh/go-spew v1.1.1 // indirect
5453
github.com/distribution/reference v0.5.0 // indirect
5554
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5655
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
5756
github.com/felixge/httpsnoop v1.0.3 // indirect
58-
github.com/go-logr/logr v1.3.0 // indirect
57+
github.com/go-logr/logr v1.4.1 // indirect
5958
github.com/go-logr/stdr v1.2.2 // indirect
60-
github.com/go-logr/zapr v1.2.3 // indirect
59+
github.com/go-logr/zapr v1.3.0 // indirect
6160
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6261
github.com/go-openapi/jsonreference v0.20.2 // indirect
6362
github.com/go-openapi/swag v0.22.3 // indirect
6463
github.com/godbus/dbus/v5 v5.1.0 // indirect
6564
github.com/gogo/protobuf v1.3.2 // indirect
6665
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6766
github.com/golang/protobuf v1.5.4 // indirect
68-
github.com/google/cadvisor v0.48.1 // indirect
69-
github.com/google/cel-go v0.17.7 // indirect
67+
github.com/google/cadvisor v0.49.0 // indirect
68+
github.com/google/cel-go v0.17.8 // indirect
7069
github.com/google/gnostic-models v0.6.8 // indirect
7170
github.com/google/go-cmp v0.6.0 // indirect
7271
github.com/google/gofuzz v1.2.0 // indirect
@@ -112,19 +111,18 @@ require (
112111
go.opentelemetry.io/otel/metric v1.19.0 // indirect
113112
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
114113
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
115-
go.uber.org/atomic v1.10.0 // indirect
116114
go.uber.org/multierr v1.11.0 // indirect
117-
go.uber.org/zap v1.19.0 // indirect
118-
golang.org/x/crypto v0.14.0 // indirect
115+
go.uber.org/zap v1.26.0 // indirect
116+
golang.org/x/crypto v0.21.0 // indirect
119117
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
120-
golang.org/x/mod v0.12.0 // indirect
121-
golang.org/x/net v0.17.0 // indirect
118+
golang.org/x/mod v0.15.0 // indirect
119+
golang.org/x/net v0.23.0 // indirect
122120
golang.org/x/oauth2 v0.10.0 // indirect
123-
golang.org/x/sync v0.3.0 // indirect
124-
golang.org/x/term v0.13.0 // indirect
125-
golang.org/x/text v0.13.0 // indirect
121+
golang.org/x/sync v0.6.0 // indirect
122+
golang.org/x/term v0.18.0 // indirect
123+
golang.org/x/text v0.14.0 // indirect
126124
golang.org/x/time v0.3.0 // indirect
127-
golang.org/x/tools v0.12.0 // indirect
125+
golang.org/x/tools v0.18.0 // indirect
128126
google.golang.org/appengine v1.6.7 // indirect
129127
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
130128
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
@@ -135,14 +133,15 @@ require (
135133
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
136134
gopkg.in/yaml.v2 v2.4.0 // indirect
137135
gopkg.in/yaml.v3 v3.0.1 // indirect
138-
k8s.io/apiextensions-apiserver v0.28.2 // indirect
139-
k8s.io/controller-manager v0.0.0 // indirect
140-
k8s.io/kms v0.28.2 // indirect
141-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
142-
k8s.io/kube-proxy v0.0.0 // indirect
143-
k8s.io/kubelet v0.0.0 // indirect
144-
k8s.io/mount-utils v0.0.0 // indirect
145-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
136+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
137+
k8s.io/controller-manager v0.30.3 // indirect
138+
k8s.io/csi-translation-lib v0.30.3 // indirect
139+
k8s.io/kms v0.30.3 // indirect
140+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
141+
k8s.io/kube-proxy v0.30.3 // indirect
142+
k8s.io/kubelet v0.30.3 // indirect
143+
k8s.io/mount-utils v0.30.3 // indirect
144+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
146145
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
147146
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
148147
)
@@ -177,34 +176,5 @@ replace (
177176
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
178177
github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0
179178
github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
180-
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240421140439-9cdc488321ce
181-
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240421140439-9cdc488321ce
182-
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240421140439-9cdc488321ce
183-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240421140439-9cdc488321ce
184-
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240421140439-9cdc488321ce
185-
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240421140439-9cdc488321ce
186-
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240421140439-9cdc488321ce
187-
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240421140439-9cdc488321ce
188-
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240421140439-9cdc488321ce
189-
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240421140439-9cdc488321ce
190-
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240421140439-9cdc488321ce
191-
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240421140439-9cdc488321ce
192-
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240421140439-9cdc488321ce
193-
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240421140439-9cdc488321ce
194-
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240421140439-9cdc488321ce
195-
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240421140439-9cdc488321ce
196-
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240421140439-9cdc488321ce
197-
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240421140439-9cdc488321ce
198-
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240421140439-9cdc488321ce
199-
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240421140439-9cdc488321ce
200-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240421140439-9cdc488321ce
201-
k8s.io/kubernetes => github.com/openshift/kubernetes v1.29.0-rc.1.0.20240421140439-9cdc488321ce
202-
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240421140439-9cdc488321ce
203-
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240421140439-9cdc488321ce
204-
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240421140439-9cdc488321ce
205-
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240421140439-9cdc488321ce
206-
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240421140439-9cdc488321ce
207-
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240421140439-9cdc488321ce
208-
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240421140439-9cdc488321ce
209179
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
210180
)

0 commit comments

Comments
 (0)