Merge pull request #412 from tkashem/pull-in-etcd-retry-patch

OCPBUGS-27104: UPSTREAM: <carry>: retry etcd Unavailable errors
openshift · Jan 14, 2024 · 9e9b51d · 9e9b51d
2 parents a936456 + fd384c8
commit 9e9b51d
Show file tree

Hide file tree

Showing 6 changed files with 223 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -186,7 +186,7 @@ replace (
 	k8s.io/api => k8s.io/api v0.27.7
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.7
 	k8s.io/apimachinery => k8s.io/apimachinery v0.27.7
-	k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20231102175227-e58ea8bb8517
+	k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20240112180301-bc101dc8b952
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.7
 	k8s.io/client-go => k8s.io/client-go v0.27.7
 	k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.7

diff --git a/go.sum b/go.sum
@@ -1022,8 +1022,8 @@ github.com/openshift/docker-distribution/v3 v3.0.0-20230613095533-f65dc997445a h
 github.com/openshift/docker-distribution/v3 v3.0.0-20230613095533-f65dc997445a/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58=
 github.com/openshift/kubernetes v0.0.0-20231102175105-d61d2d7405d7 h1:aIA+4q6ZDDRJBkfLuw78WlnvLJmLxjHLe/DuLkKqOcE=
 github.com/openshift/kubernetes v0.0.0-20231102175105-d61d2d7405d7/go.mod h1:9RuASG1ooCxhMDOxMG5nJ0Vw/wap9iylq4Y/Uzn/R/0=
-github.com/openshift/kubernetes-apiserver v0.0.0-20231102175227-e58ea8bb8517 h1:6igw70rzurPqW5qqLTiFkpORG0KzNLe+xM/+iwtDm3A=
-github.com/openshift/kubernetes-apiserver v0.0.0-20231102175227-e58ea8bb8517/go.mod h1:OrLG9RwCOerutAlo8QJW5EHzUG9Dad7k6rgcDUNSO/w=
+github.com/openshift/kubernetes-apiserver v0.0.0-20240112180301-bc101dc8b952 h1:bnMz+L8IjuURKTZHCmCBz3LS1jbTIU67pXGP3yi/sQc=
+github.com/openshift/kubernetes-apiserver v0.0.0-20240112180301-bc101dc8b952/go.mod h1:OrLG9RwCOerutAlo8QJW5EHzUG9Dad7k6rgcDUNSO/w=
 github.com/openshift/library-go v0.0.0-20230808150704-ce4395c85e8c h1:UJjxHFSTcasHxRXtDc3od9p7UJUBJxUKjhZHFyp2uUQ=
 github.com/openshift/library-go v0.0.0-20230808150704-ce4395c85e8c/go.mod h1:ZFwNwC3opc/7aOvzUbU95zp33Lbxet48h80ryH3p6DY=
 github.com/openshift/moby-moby v0.0.0-20190308215630-da810a85109d h1:fLITXDjxMSvUDjnXs/zljIWktbST9+Om8XbrmmM7T4I=

diff --git a/vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go b/vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go
diff --git a/vendor/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go b/vendor/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go
diff --git a/vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go b/vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1253,7 +1253,7 @@ k8s.io/apimachinery/pkg/watch
 k8s.io/apimachinery/third_party/forked/golang/json
 k8s.io/apimachinery/third_party/forked/golang/netutil
 k8s.io/apimachinery/third_party/forked/golang/reflect
-# k8s.io/apiserver v0.27.7 => github.com/openshift/kubernetes-apiserver v0.0.0-20231102175227-e58ea8bb8517
+# k8s.io/apiserver v0.27.7 => github.com/openshift/kubernetes-apiserver v0.0.0-20240112180301-bc101dc8b952
 ## explicit; go 1.20
 k8s.io/apiserver/pkg/admission
 k8s.io/apiserver/pkg/admission/cel
@@ -1372,6 +1372,7 @@ k8s.io/apiserver/pkg/storage/cacher
 k8s.io/apiserver/pkg/storage/cacher/metrics
 k8s.io/apiserver/pkg/storage/errors
 k8s.io/apiserver/pkg/storage/etcd3
+k8s.io/apiserver/pkg/storage/etcd3/etcd3retry
 k8s.io/apiserver/pkg/storage/etcd3/metrics
 k8s.io/apiserver/pkg/storage/etcd3/testing
 k8s.io/apiserver/pkg/storage/etcd3/testserver
@@ -2234,7 +2235,7 @@ sigs.k8s.io/yaml
 # k8s.io/api => k8s.io/api v0.27.7
 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.7
 # k8s.io/apimachinery => k8s.io/apimachinery v0.27.7
-# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20231102175227-e58ea8bb8517
+# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20240112180301-bc101dc8b952
 # k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.7
 # k8s.io/client-go => k8s.io/client-go v0.27.7
 # k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.7