Merge pull request #127186 from Adarsh-verma-14/remove-duplication

remove the feature flag duplicate definition from pkg/features/kube_features.go

Kubernetes-commit: 0aea469b96a1c0fed48dd2d4a0af96d36e24968c
This commit is contained in:
Kubernetes Publisher 2024-09-10 23:05:56 +01:00
commit 14b3ab9aa0
3 changed files with 4 additions and 3 deletions

2
go.mod
View File

@ -48,7 +48,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20240904172100-421904605ee4 k8s.io/api v0.0.0-20240904172100-421904605ee4
k8s.io/apimachinery v0.0.0-20240827232741-2465dc5239ab k8s.io/apimachinery v0.0.0-20240827232741-2465dc5239ab
k8s.io/client-go v0.0.0-20240905153435-51f5488cb945 k8s.io/client-go v0.0.0-20240910233403-8d0bbdfdcc60
k8s.io/component-base v0.0.0-20240906193739-83f63c39727c k8s.io/component-base v0.0.0-20240906193739-83f63c39727c
k8s.io/klog/v2 v2.130.1 k8s.io/klog/v2 v2.130.1
k8s.io/kms v0.0.0-20240827234606-4aa59ca2ab14 k8s.io/kms v0.0.0-20240827234606-4aa59ca2ab14

4
go.sum
View File

@ -375,8 +375,8 @@ k8s.io/api v0.0.0-20240904172100-421904605ee4 h1:9DzAHxY5bq9xM+21VvXaMiQyQrp6DuO
k8s.io/api v0.0.0-20240904172100-421904605ee4/go.mod h1:ripUAtqwG9GJ/8+oGJ64+WUGoZ06zX0O8M6PVyCFA3k= k8s.io/api v0.0.0-20240904172100-421904605ee4/go.mod h1:ripUAtqwG9GJ/8+oGJ64+WUGoZ06zX0O8M6PVyCFA3k=
k8s.io/apimachinery v0.0.0-20240827232741-2465dc5239ab h1:Q5sDIA+AALw+7kUA1B/eF3yOJ85ODdIe01A1TNT2t28= k8s.io/apimachinery v0.0.0-20240827232741-2465dc5239ab h1:Q5sDIA+AALw+7kUA1B/eF3yOJ85ODdIe01A1TNT2t28=
k8s.io/apimachinery v0.0.0-20240827232741-2465dc5239ab/go.mod h1:ICcwUwxYZmFXLu9oug48MqosXwccA+UCIOOtZRgdQX0= k8s.io/apimachinery v0.0.0-20240827232741-2465dc5239ab/go.mod h1:ICcwUwxYZmFXLu9oug48MqosXwccA+UCIOOtZRgdQX0=
k8s.io/client-go v0.0.0-20240905153435-51f5488cb945 h1:aJJZ6rmRgVTEWZgN9iJ0cLeqSBzMdtsHqUVoU+Ma3d8= k8s.io/client-go v0.0.0-20240910233403-8d0bbdfdcc60 h1:FukG1iRFBY/wY/Ex9J1as0Ltd2EXhFW4q+U0yFUcPr0=
k8s.io/client-go v0.0.0-20240905153435-51f5488cb945/go.mod h1:BJxAcDajRsYKDFi5bdyuHTvg+YAm5cWW+JP6mvUcNb0= k8s.io/client-go v0.0.0-20240910233403-8d0bbdfdcc60/go.mod h1:BJxAcDajRsYKDFi5bdyuHTvg+YAm5cWW+JP6mvUcNb0=
k8s.io/component-base v0.0.0-20240906193739-83f63c39727c h1:Gdhz79FA3l8bKFBM1eYC63F/ys6eNfQqPGkdy5xAe/8= k8s.io/component-base v0.0.0-20240906193739-83f63c39727c h1:Gdhz79FA3l8bKFBM1eYC63F/ys6eNfQqPGkdy5xAe/8=
k8s.io/component-base v0.0.0-20240906193739-83f63c39727c/go.mod h1:roKR20Tbxxh1HGxr9Fc1EzHkKJMH9Wfkau/U/EgjXys= k8s.io/component-base v0.0.0-20240906193739-83f63c39727c/go.mod h1:roKR20Tbxxh1HGxr9Fc1EzHkKJMH9Wfkau/U/EgjXys=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

View File

@ -188,6 +188,7 @@ const (
// owner: @jpbetz // owner: @jpbetz
// alpha: v1.30 // alpha: v1.30
// beta: v1.31
// Resource create requests using generateName are retried automatically by the apiserver // Resource create requests using generateName are retried automatically by the apiserver
// if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries. // if the generated name conflicts with an existing resource name, up to a maximum number of 7 retries.
RetryGenerateName featuregate.Feature = "RetryGenerateName" RetryGenerateName featuregate.Feature = "RetryGenerateName"