From c52c9aa9d98d4a9d7da3161614dd6a7e3fa11c02 Mon Sep 17 00:00:00 2001 From: rasmus Date: Mon, 7 Nov 2022 01:24:29 +0200 Subject: [PATCH] Use actual fork of go.mod It needed a lot of thinking... --- go.mod | 5 +++-- go.sum | 4 ++-- vendor/modules.txt | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3e69a5c..0771e1e 100644 --- a/go.mod +++ b/go.mod @@ -46,5 +46,6 @@ require ( k8s.io/utils v0.0.0-20221101230645-61b03e2f6476 // indirect ) -// github.com/jtagcat/kubernetes@ManagedExponentialBackoff -replace k8s.io/apimachinery => github.com/jtagcat/kubernetes-apimachinery-staging v0.0.0-20221106224939-f2cfa8379a1d +// https://github.com/kubernetes/kubernetes/pull/113398 +// go get github.com/jtagcat/kubernetes/staging/src/k8s.io/apimachinery@ManagedExponentialBackoff +replace k8s.io/apimachinery => github.com/jtagcat/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221027124836-581f57977fff diff --git a/go.sum b/go.sum index 808849e..88dfb52 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtagcat/kubernetes-apimachinery-staging v0.0.0-20221106224939-f2cfa8379a1d h1:hPtLlX33HayimPgy2mXkEyNtXfsgaNnfvxWkONhJu8E= -github.com/jtagcat/kubernetes-apimachinery-staging v0.0.0-20221106224939-f2cfa8379a1d/go.mod h1:Hd1yRMMl0JGWIESCBJ7h+Kx41qOSgAc/KAsQzBWh9Dc= +github.com/jtagcat/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221027124836-581f57977fff h1:ZcCL47dbIlY58XGBk10Onnig0Ce+w0kWxJhaEDHJfmY= +github.com/jtagcat/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221027124836-581f57977fff/go.mod h1:C5R3NoUmJXuT6/sTJpOktLUfvCl+H4/7c2QHOp6qwCo= github.com/jtagcat/util v0.0.0-20221106213317-cab09054fbdd h1:B79h8kW0DCqZvnLqleNZf5SzRV8wO58RMv2pCwb9bKc= github.com/jtagcat/util v0.0.0-20221106213317-cab09054fbdd/go.mod h1:VIg6NAm5vU1HwDCL8p/iILmCwvgVCP3/U4QhlS6hftY= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= diff --git a/vendor/modules.txt b/vendor/modules.txt index 0e14e7b..e436593 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -189,7 +189,7 @@ google.golang.org/protobuf/runtime/protoiface google.golang.org/protobuf/runtime/protoimpl google.golang.org/protobuf/types/descriptorpb google.golang.org/protobuf/types/known/timestamppb -# k8s.io/apimachinery v0.25.3 => github.com/jtagcat/kubernetes-apimachinery-staging v0.0.0-20221106224939-f2cfa8379a1d +# k8s.io/apimachinery v0.25.3 => github.com/jtagcat/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221027124836-581f57977fff ## explicit; go 1.19 k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/wait @@ -204,4 +204,4 @@ k8s.io/klog/v2/internal/severity # k8s.io/utils v0.0.0-20221101230645-61b03e2f6476 ## explicit; go 1.18 k8s.io/utils/clock -# k8s.io/apimachinery => github.com/jtagcat/kubernetes-apimachinery-staging v0.0.0-20221106224939-f2cfa8379a1d +# k8s.io/apimachinery => github.com/jtagcat/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221027124836-581f57977fff