Skip to content

Commit 343e096

Browse files
committed
Prevent storage layer retries for methods with side effects.
1 parent afe74a0 commit 343e096

File tree

5 files changed

+73
-25
lines changed

5 files changed

+73
-25
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ require (
1919
github.com/spf13/cobra v1.8.1
2020
github.com/spf13/pflag v1.0.5
2121
github.com/stretchr/testify v1.9.0
22-
go.opentelemetry.io/otel/trace v1.28.0
2322
k8s.io/api v0.31.1
2423
k8s.io/apiextensions-apiserver v0.31.1
2524
k8s.io/apimachinery v0.31.1
@@ -105,6 +104,7 @@ require (
105104
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
106105
go.opentelemetry.io/otel/metric v1.28.0 // indirect
107106
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
107+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
108108
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
109109
go.uber.org/multierr v1.11.0 // indirect
110110
go.uber.org/zap v1.26.0 // indirect
@@ -141,7 +141,7 @@ replace (
141141
k8s.io/api => k8s.io/api v0.31.1
142142
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
143143
k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
144-
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20241112103933-0f10e4260855 // points to openshift-apiserver-4.18-kubernetes-1.31.1
144+
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20250205074533-d8ec43992017 // points to openshift-apiserver-4.18-kubernetes-1.31.1
145145
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
146146
k8s.io/client-go => k8s.io/client-go v0.31.1
147147
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0
175175
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
176176
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
177177
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
178-
github.com/openshift/kubernetes-apiserver v0.0.0-20241112103933-0f10e4260855 h1:sxkHh3Bhcqg/tkoPN3s9bdCHri4V+nR4hVwXoRTK34I=
179-
github.com/openshift/kubernetes-apiserver v0.0.0-20241112103933-0f10e4260855/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
178+
github.com/openshift/kubernetes-apiserver v0.0.0-20250205074533-d8ec43992017 h1:gy3tyQdS6Qv8pfLfH/jbwK3fMAos6RVN/tE9cF7dTyA=
179+
github.com/openshift/kubernetes-apiserver v0.0.0-20250205074533-d8ec43992017/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
180180
github.com/openshift/library-go v0.0.0-20241104153602-864cc9d1d646 h1:rQD7LQAwBdrAS81NR37a2kjJl8gqm5mBYhHa9BESBO4=
181181
github.com/openshift/library-go v0.0.0-20241104153602-864cc9d1d646/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
182182
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

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

+65-17
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

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ k8s.io/apimachinery/pkg/version
901901
k8s.io/apimachinery/pkg/watch
902902
k8s.io/apimachinery/third_party/forked/golang/json
903903
k8s.io/apimachinery/third_party/forked/golang/reflect
904-
# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes-apiserver v0.0.0-20241112103933-0f10e4260855
904+
# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes-apiserver v0.0.0-20250205074533-d8ec43992017
905905
## explicit; go 1.22.0
906906
k8s.io/apiserver/pkg/admission
907907
k8s.io/apiserver/pkg/admission/configuration
@@ -1559,7 +1559,7 @@ sigs.k8s.io/yaml/goyaml.v2
15591559
# k8s.io/api => k8s.io/api v0.31.1
15601560
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
15611561
# k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
1562-
# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20241112103933-0f10e4260855
1562+
# k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20250205074533-d8ec43992017
15631563
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
15641564
# k8s.io/client-go => k8s.io/client-go v0.31.1
15651565
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1

0 commit comments

Comments
 (0)