Skip to content

Commit dfe2d54

Browse files
committed
Bump openshift/kubernetes-apiserver for etcd retry patches.
1 parent 54bd97a commit dfe2d54

File tree

7 files changed

+123
-29
lines changed

7 files changed

+123
-29
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ replace (
138138
k8s.io/api => k8s.io/api v0.29.2
139139
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2
140140
k8s.io/apimachinery => k8s.io/apimachinery v0.29.2
141-
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab // points to openshift-apiserver-4.16-kubernetes-1.29.2
141+
k8s.io/apiserver => github.com/benluddy/kubernetes-apiserver v0.0.0-20250912144233-500a2c5d9e4a // points to openshift-apiserver-4.16-kubernetes-1.29.2
142142
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2
143143
k8s.io/client-go => k8s.io/client-go v0.29.2
144144
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4
1717
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
1818
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
1919
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
20+
github.com/benluddy/kubernetes-apiserver v0.0.0-20250912144233-500a2c5d9e4a h1:auNvEXSNLo7jk4+vmUhuFX9Rqux6TNmwK1U+SO/+Mws=
21+
github.com/benluddy/kubernetes-apiserver v0.0.0-20250912144233-500a2c5d9e4a/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ=
2022
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
2123
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
2224
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -174,8 +176,6 @@ github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c h1:gJ
174176
github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
175177
github.com/openshift/client-go v0.0.0-20240408153607-64bd6feb83ae h1:WzEMf853apLG0ZgkfmKvYXBKBqhzx7nalP306yQP1ck=
176178
github.com/openshift/client-go v0.0.0-20240408153607-64bd6feb83ae/go.mod h1:YOfx7b9ieudQJImuo95BcVzifosCrCGBErbO/w/njBU=
177-
github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab h1:hVEUWx+0XiMkstOLlQ5BiBZTnA7WWJJf80Dc2L2FLyM=
178-
github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ=
179179
github.com/openshift/library-go v0.0.0-20240408090355-0b298992f8cc h1:wYPToL2tSf8rey0YhdhqgVR1r8ES83o5YuUcJU4znMM=
180180
github.com/openshift/library-go v0.0.0-20240408090355-0b298992f8cc/go.mod h1:m/HsttSi90vSixwoy5mPUBHcZid2YRw/QbsLErLxF9s=
181181
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

vendor/k8s.io/apiserver/pkg/storage/etcd3/etcd3retry/retry_etcdclient.go

Lines changed: 68 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/factory.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/retry_etcdprobemonitor.go

Lines changed: 46 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ k8s.io/apimachinery/pkg/version
868868
k8s.io/apimachinery/pkg/watch
869869
k8s.io/apimachinery/third_party/forked/golang/json
870870
k8s.io/apimachinery/third_party/forked/golang/reflect
871-
# k8s.io/apiserver v0.29.2 => github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab
871+
# k8s.io/apiserver v0.29.2 => github.com/benluddy/kubernetes-apiserver v0.0.0-20250912144233-500a2c5d9e4a
872872
## explicit; go 1.21
873873
k8s.io/apiserver/pkg/admission
874874
k8s.io/apiserver/pkg/admission/cel
@@ -1453,7 +1453,7 @@ sigs.k8s.io/yaml
14531453
# k8s.io/api => k8s.io/api v0.29.2
14541454
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2
14551455
# k8s.io/apimachinery => k8s.io/apimachinery v0.29.2
1456-
# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab
1456+
# k8s.io/apiserver => github.com/benluddy/kubernetes-apiserver v0.0.0-20250912144233-500a2c5d9e4a
14571457
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2
14581458
# k8s.io/client-go => k8s.io/client-go v0.29.2
14591459
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2

0 commit comments

Comments
 (0)