diff --git a/go.mod b/go.mod index 7a5a8f76b..0144ab7bd 100644 --- a/go.mod +++ b/go.mod @@ -30,9 +30,9 @@ require ( google.golang.org/protobuf v1.36.3 k8s.io/api v0.32.1 k8s.io/apimachinery v0.32.1 - k8s.io/apiserver v0.31.3 + k8s.io/apiserver v0.31.6 k8s.io/client-go v0.32.1 - k8s.io/component-base v0.31.3 + k8s.io/component-base v0.31.6 k8s.io/klog/v2 v2.130.1 k8s.io/kubernetes v1.31.1 k8s.io/mount-utils v0.32.0 @@ -158,49 +158,49 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.0.0 // indirect - k8s.io/cloud-provider v0.31.3 // indirect - k8s.io/component-helpers v0.31.3 // indirect - k8s.io/controller-manager v0.31.3 // indirect + k8s.io/cloud-provider v0.31.6 // indirect + k8s.io/component-helpers v0.31.6 // indirect + k8s.io/controller-manager v0.31.6 // indirect k8s.io/kms v0.32.0-alpha.0 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect k8s.io/kubectl v0.31.1 // indirect - k8s.io/kubelet v0.31.3 // indirect + k8s.io/kubelet v0.31.6 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect ) replace ( - k8s.io/api => k8s.io/api v0.31.3 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3 - k8s.io/apimachinery => k8s.io/apimachinery v0.31.3 - k8s.io/apiserver => k8s.io/apiserver v0.31.3 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3 - k8s.io/client-go => k8s.io/client-go v0.31.3 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3 - k8s.io/code-generator => k8s.io/code-generator v0.31.3 - k8s.io/component-base => k8s.io/component-base v0.31.3 - k8s.io/component-helpers => k8s.io/component-helpers v0.31.3 - k8s.io/controller-manager => k8s.io/controller-manager v0.31.3 - k8s.io/cri-api => k8s.io/cri-api v0.31.3 - k8s.io/cri-client => k8s.io/cri-client v0.31.3 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3 - k8s.io/endpointslice => k8s.io/endpointslice v0.31.3 - k8s.io/kms => k8s.io/kms v0.31.3 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3 - k8s.io/kubectl => k8s.io/kubectl v0.31.3 - k8s.io/kubelet => k8s.io/kubelet v0.31.3 - k8s.io/kubernetes => k8s.io/kubernetes v1.31.3 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3 - k8s.io/metrics => k8s.io/metrics v0.31.3 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3 - k8s.io/sample-controller => k8s.io/sample-controller v0.31.3 + k8s.io/api => k8s.io/api v0.31.6 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6 + k8s.io/apimachinery => k8s.io/apimachinery v0.31.6 + k8s.io/apiserver => k8s.io/apiserver v0.31.6 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.6 + k8s.io/client-go => k8s.io/client-go v0.31.6 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6 + k8s.io/code-generator => k8s.io/code-generator v0.31.6 + k8s.io/component-base => k8s.io/component-base v0.31.6 + k8s.io/component-helpers => k8s.io/component-helpers v0.31.6 + k8s.io/controller-manager => k8s.io/controller-manager v0.31.6 + k8s.io/cri-api => k8s.io/cri-api v0.31.6 + k8s.io/cri-client => k8s.io/cri-client v0.31.6 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6 + k8s.io/endpointslice => k8s.io/endpointslice v0.31.6 + k8s.io/kms => k8s.io/kms v0.31.6 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6 + k8s.io/kubectl => k8s.io/kubectl v0.31.6 + k8s.io/kubelet => k8s.io/kubelet v0.31.6 + k8s.io/kubernetes => k8s.io/kubernetes v1.31.6 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.6 + k8s.io/metrics => k8s.io/metrics v0.31.6 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.6 + k8s.io/sample-controller => k8s.io/sample-controller v0.31.6 sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1 ) diff --git a/go.sum b/go.sum index c2ff02d25..3aa88810e 100644 --- a/go.sum +++ b/go.sum @@ -430,42 +430,42 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= -k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= -k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE= -k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4= -k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= -k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY= -k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg= -k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= -k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= -k8s.io/cloud-provider v0.31.3 h1:7C3CHQUUwnv/HWWVIaibZH06iPg663RYQ6C6Zy4FnO8= -k8s.io/cloud-provider v0.31.3/go.mod h1:c7csKppoVb9Ej6upJ28AvHy4B3BtlRMzXfgezsDdPKw= -k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ= -k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU= -k8s.io/component-helpers v0.31.3 h1:0zGPD2PrekhFWgmz85XxlMEl7dfhlKC1tERZDe3onQc= -k8s.io/component-helpers v0.31.3/go.mod h1:HZ1HZx2TKXM7xSUV2cR9L5yDoyZPhhHQNaE3BPBLPUQ= -k8s.io/controller-manager v0.31.3 h1:TyUav69iNYwLGwA96JDhusoZoGRdh1sdrLjXmWTcPgs= -k8s.io/controller-manager v0.31.3/go.mod h1:yuhec+dbXmBz+4c32kxJxmcauB+1pjO2ttfYODWuv18= -k8s.io/csi-translation-lib v0.31.3 h1:hxcPRNdtEsk766jCXSKjgH1V8jUNx5tVqdooQ1Ars/M= -k8s.io/csi-translation-lib v0.31.3/go.mod h1:0B1gQwd868XUIDwJYy5gB2jDXWEwlcWvSsfcQEgzbRk= +k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg= +k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4= +k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0= +k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI= +k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY= +k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw= +k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo= +k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4= +k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY= +k8s.io/cloud-provider v0.31.6 h1:5vVMyf/m/n8ij/GmSJLRcatchmciRr0gs4peBcxqvKk= +k8s.io/cloud-provider v0.31.6/go.mod h1:iT6kIEMEXrTIvRBAaRU5qefRzgPaSV6kwTc6mjhhnEw= +k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI= +k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM= +k8s.io/component-helpers v0.31.6 h1:Af8BcE6pElKlLaerwW9s04jTQVFa66wmI1pkaNfDWzE= +k8s.io/component-helpers v0.31.6/go.mod h1:6CRV6M+7R13eqtz4FBm2ty9eH+QajDcP3y0Bklzh2FA= +k8s.io/controller-manager v0.31.6 h1:HQRUV6nogHo2N7vr3cgVNjZ+wvHIMvxEMjTeCrHitE4= +k8s.io/controller-manager v0.31.6/go.mod h1:0HDNTZVapQFa9G96jNxrU99ht7fQJVEKBXDzqKDMez0= +k8s.io/csi-translation-lib v0.31.6 h1:mBkF3AG8pRcwZv8SY7qT1JWznRsmYjZfT5Lxel9nN4Q= +k8s.io/csi-translation-lib v0.31.6/go.mod h1:I2F51irYJyt78so7wdral65B7PB7jR3keZ2MpB78mWw= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc= -k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94= +k8s.io/kms v0.31.6 h1:p7OY+9Hp8nPtgzm0vT9TrERNigQQSu8tkgWqn+GvB2w= +k8s.io/kms v0.31.6/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= -k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes= -k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs= -k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI= -k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8= -k8s.io/kubernetes v1.31.3 h1:oqb7HdfnTelrGlZ6ziNugvQ/L/aJWR704114EAhUn9Q= -k8s.io/kubernetes v1.31.3/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs= +k8s.io/kubectl v0.31.6 h1:ngzql/UugqpEbeeyQX678BlVHXks19JR3CFjwKnWuFI= +k8s.io/kubectl v0.31.6/go.mod h1:m6OXbx9s0sZiaZrfHHSEmJUD5CjWPA5+cVg0GZnVdzM= +k8s.io/kubelet v0.31.6 h1:lxVvyLNDcb/QTpQNkDySk3iscgq4zubeSZs3cF6PmaA= +k8s.io/kubelet v0.31.6/go.mod h1:BPghO52ilF7UzFEVBmYFOxdVtLge0P1gixjz84lBzzc= +k8s.io/kubernetes v1.31.6 h1:zVhgWDFHmIj51o5sNARmjdgNvpq4K2Smya8pS5vxqlc= +k8s.io/kubernetes v1.31.6/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs= k8s.io/mount-utils v0.32.0 h1:KOQAhPzJICATXnc6XCkWoexKbkOexRnMCUW8APFfwg4= k8s.io/mount-utils v0.32.0/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -k8s.io/pod-security-admission v0.31.3 h1:8NzEV0HtdStX367AuSKfRMIZHn0hT4xuz8xNEf7/zO8= -k8s.io/pod-security-admission v0.31.3/go.mod h1:YMIcTe/7f9R9d+3ErCMMM3Wtbj9ejKo7Z9S0OxZQrRg= +k8s.io/pod-security-admission v0.31.6 h1:5WnXyl+UNmQb73O0L1w82uaUEPuvp+sxdhXRiOLdCkY= +k8s.io/pod-security-admission v0.31.6/go.mod h1:b+ZpSSR+XMx3t9Pvy/GdcXoI0CEpiWGT7IGAhcOBcGM= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= diff --git a/vendor/k8s.io/apiserver/pkg/server/filters/maxinflight.go b/vendor/k8s.io/apiserver/pkg/server/filters/maxinflight.go index 9effcb768..8672c0942 100644 --- a/vendor/k8s.io/apiserver/pkg/server/filters/maxinflight.go +++ b/vendor/k8s.io/apiserver/pkg/server/filters/maxinflight.go @@ -50,7 +50,7 @@ var ( func handleError(w http.ResponseWriter, r *http.Request, err error) { errorMsg := fmt.Sprintf("Internal Server Error: %#v", r.RequestURI) http.Error(w, errorMsg, http.StatusInternalServerError) - klog.Errorf(err.Error()) + klog.Error(err.Error()) } // requestWatermark is used to track maximal numbers of requests in a particular phase of handling diff --git a/vendor/k8s.io/client-go/tools/remotecommand/v4.go b/vendor/k8s.io/client-go/tools/remotecommand/v4.go index 69ca934a0..6146bdf12 100644 --- a/vendor/k8s.io/client-go/tools/remotecommand/v4.go +++ b/vendor/k8s.io/client-go/tools/remotecommand/v4.go @@ -115,5 +115,5 @@ func (d *errorDecoderV4) decode(message []byte) error { return errors.New("error stream protocol error: unknown error") } - return fmt.Errorf(status.Message) + return errors.New(status.Message) } diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go index 519d448dd..115644280 100644 --- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go +++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go @@ -524,7 +524,8 @@ const ( // alpha: v1.27 // beta: v1.30 // - // Enables querying logs of node services using the /logs endpoint + // Enables querying logs of node services using the /logs endpoint. Enabling this feature has security implications. + // The recommendation is to enable it on a need basis for debugging purposes and disabling otherwise. NodeLogQuery featuregate.Feature = "NodeLogQuery" // owner: @xing-yang @sonasingh46 diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go b/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go index 66ac77835..18cbec072 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go @@ -31,8 +31,13 @@ import ( "k8s.io/klog/v2" ) -// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent +// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent. If called with a device +// already resolved to devicemapper, do nothing. func (handler *deviceHandler) FindMultipathDeviceForDevice(device string) string { + if strings.HasPrefix(device, "/dev/dm-") { + return device + } + io := handler.getIo disk, err := findDeviceForPath(device, io) if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/recyclerclient/recycler_client.go b/vendor/k8s.io/kubernetes/pkg/volume/util/recyclerclient/recycler_client.go index b7197dbdf..e438ba21e 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/recyclerclient/recycler_client.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/recyclerclient/recycler_client.go @@ -18,11 +18,12 @@ package recyclerclient import ( "context" + "errors" "fmt" "sync" "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/watch" @@ -72,7 +73,7 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *v1.Po // Start the pod _, err = recyclerClient.CreatePod(pod) if err != nil { - if errors.IsAlreadyExists(err) { + if apierrors.IsAlreadyExists(err) { deleteErr := recyclerClient.DeletePod(pod.Name, pod.Namespace) if deleteErr != nil { return fmt.Errorf("failed to delete old recycler pod %s/%s: %s", pod.Namespace, pod.Name, deleteErr) @@ -128,7 +129,7 @@ func waitForPod(pod *v1.Pod, recyclerClient recyclerClient, podCh <-chan watch.E } if pod.Status.Phase == v1.PodFailed { if pod.Status.Message != "" { - return fmt.Errorf(pod.Status.Message) + return errors.New(pod.Status.Message) } return fmt.Errorf("pod failed, pod.Status.Message unknown") } diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/debug/resource_usage_gatherer.go b/vendor/k8s.io/kubernetes/test/e2e/framework/debug/resource_usage_gatherer.go index 9c6537ed9..7e6875b49 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/debug/resource_usage_gatherer.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/debug/resource_usage_gatherer.go @@ -21,6 +21,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "math" "regexp" @@ -595,7 +596,7 @@ func (g *ContainerResourceGatherer) StopAndSummarize(percentiles []int, constrai } } if len(violatedConstraints) > 0 { - return &summary, fmt.Errorf(strings.Join(violatedConstraints, "\n")) + return &summary, errors.New(strings.Join(violatedConstraints, "\n")) } return &summary, nil } diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/flake_reporting_util.go b/vendor/k8s.io/kubernetes/test/e2e/framework/flake_reporting_util.go index 36d9baa98..103345fb6 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/flake_reporting_util.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/flake_reporting_util.go @@ -57,7 +57,7 @@ func (f *FlakeReport) RecordFlakeIfError(err error, optionalDescription ...inter if desc != "" { msg = fmt.Sprintf("%v (Description: %v)", msg, desc) } - Logf(msg) + Logf("%s", msg) f.lock.Lock() defer f.lock.Unlock() f.Flakes = append(f.Flakes, msg) diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/framework.go b/vendor/k8s.io/kubernetes/test/e2e/framework/framework.go index a71d46c7b..ff08e25b4 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/framework.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/framework.go @@ -311,7 +311,7 @@ func printSummaries(summaries []TestDataSummary, testBaseName string) { switch TestContext.OutputPrintType { case "hr": if TestContext.ReportDir == "" { - Logf(summaries[i].PrintHumanReadable()) + Logf("%s", summaries[i].PrintHumanReadable()) } else { // TODO: learn to extract test name and append it to the kind instead of timestamp. filePath := path.Join(TestContext.ReportDir, summaries[i].SummaryKind()+"_"+testBaseName+"_"+now.Format(time.RFC3339)+".txt") @@ -393,7 +393,7 @@ func (f *Framework) AfterEach(ctx context.Context) { for namespaceKey, namespaceErr := range nsDeletionErrors { messages = append(messages, fmt.Sprintf("Couldn't delete ns: %q: %s (%#v)", namespaceKey, namespaceErr, namespaceErr)) } - Failf(strings.Join(messages, ",")) + Fail(strings.Join(messages, ",")) } }() diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/node/resource.go b/vendor/k8s.io/kubernetes/test/e2e/framework/node/resource.go index a57473bab..a7750399c 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/node/resource.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/node/resource.go @@ -128,7 +128,7 @@ func isNodeConditionSetAsExpected(node *v1.Node, conditionType v1.NodeConditionT conditionType, node.Name, cond.Status == v1.ConditionTrue, taints) } if !silent { - framework.Logf(msg) + framework.Logf("%s", msg) } return false } @@ -822,6 +822,6 @@ func verifyThatTaintIsGone(ctx context.Context, c clientset.Interface, nodeName // TODO use wrapper methods in expect.go after removing core e2e dependency on node gomega.ExpectWithOffset(2, err).NotTo(gomega.HaveOccurred()) if taintExists(nodeUpdated.Spec.Taints, taint) { - framework.Failf("Failed removing taint " + taint.ToString() + " of the node " + nodeName) + framework.Fail("Failed removing taint " + taint.ToString() + " of the node " + nodeName) } } diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/skipper/skipper.go b/vendor/k8s.io/kubernetes/test/e2e/framework/skipper/skipper.go index 7d3b3d6b3..955ff2607 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/skipper/skipper.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/skipper/skipper.go @@ -46,10 +46,13 @@ func Skipf(format string, args ...interface{}) { panic("unreachable") } +// Skip is an alias for ginkgo.Skip. +var Skip = ginkgo.Skip + // SkipUnlessAtLeast skips if the value is less than the minValue. func SkipUnlessAtLeast(value int, minValue int, message string) { if value < minValue { - skipInternalf(1, message) + skipInternalf(1, "%s", message) } } diff --git a/vendor/k8s.io/kubernetes/test/utils/density_utils.go b/vendor/k8s.io/kubernetes/test/utils/density_utils.go index 23917ad9f..e0747c489 100644 --- a/vendor/k8s.io/kubernetes/test/utils/density_utils.go +++ b/vendor/k8s.io/kubernetes/test/utils/density_utils.go @@ -18,6 +18,7 @@ package utils import ( "context" + "errors" "fmt" "strings" "time" @@ -99,7 +100,7 @@ func VerifyLabelsRemoved(c clientset.Interface, nodeName string, labelKeys []str } for _, labelKey := range labelKeys { if node.Labels != nil && len(node.Labels[labelKey]) != 0 { - return fmt.Errorf("Failed removing label " + labelKey + " of the node " + nodeName) + return errors.New("Failed removing label " + labelKey + " of the node " + nodeName) } } return nil diff --git a/vendor/k8s.io/kubernetes/test/utils/deployment.go b/vendor/k8s.io/kubernetes/test/utils/deployment.go index a8876d799..eaa618a6c 100644 --- a/vendor/k8s.io/kubernetes/test/utils/deployment.go +++ b/vendor/k8s.io/kubernetes/test/utils/deployment.go @@ -18,6 +18,7 @@ package utils import ( "context" + "errors" "fmt" "time" @@ -226,7 +227,7 @@ func WaitForDeploymentRevisionAndImage(c clientset.Interface, ns, deploymentName }) if wait.Interrupted(err) { LogReplicaSetsOfDeployment(deployment, nil, newRS, logf) - err = fmt.Errorf(reason) + err = errors.New(reason) } if newRS == nil { return fmt.Errorf("deployment %q failed to create new replica set", deploymentName) diff --git a/vendor/k8s.io/kubernetes/test/utils/image/manifest.go b/vendor/k8s.io/kubernetes/test/utils/image/manifest.go index 22de8316e..bfed29232 100644 --- a/vendor/k8s.io/kubernetes/test/utils/image/manifest.go +++ b/vendor/k8s.io/kubernetes/test/utils/image/manifest.go @@ -229,7 +229,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.9"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.13"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.15-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} diff --git a/vendor/k8s.io/kubernetes/test/utils/runners.go b/vendor/k8s.io/kubernetes/test/utils/runners.go index eccc78ac4..35c002950 100644 --- a/vendor/k8s.io/kubernetes/test/utils/runners.go +++ b/vendor/k8s.io/kubernetes/test/utils/runners.go @@ -664,7 +664,7 @@ func (config *RCConfig) start(ctx context.Context) error { *config.CreatedPods = startupStatus.Created } if !config.Silent { - config.RCConfigLog(startupStatus.String(config.Name)) + config.RCConfigLog("%s", startupStatus.String(config.Name)) } if config.PodStatusFile != nil { @@ -688,8 +688,8 @@ func (config *RCConfig) start(ctx context.Context) error { if podDeletionsCount > config.MaxAllowedPodDeletions { // Number of pods which disappeared is over threshold err := fmt.Errorf("%d pods disappeared for %s: %v", podDeletionsCount, config.Name, strings.Join(deletedPods, ", ")) - config.RCConfigLog(err.Error()) - config.RCConfigLog(diff.String(sets.NewString())) + config.RCConfigLog("%s", err.Error()) + config.RCConfigLog("%s", diff.String(sets.NewString())) return err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 1b4fcf9dc..9a67af265 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -804,7 +804,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.1 => k8s.io/api v0.31.3 +# k8s.io/api v0.32.1 => k8s.io/api v0.31.6 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -864,12 +864,12 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.31.3 +# k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.31.6 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.32.1 => k8s.io/apimachinery v0.31.3 +# k8s.io/apimachinery v0.32.1 => k8s.io/apimachinery v0.31.6 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -936,7 +936,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.31.3 => k8s.io/apiserver v0.31.3 +# k8s.io/apiserver v0.31.6 => k8s.io/apiserver v0.31.6 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1087,7 +1087,7 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/client-go v0.32.1 => k8s.io/client-go v0.31.3 +# k8s.io/client-go v0.32.1 => k8s.io/client-go v0.31.6 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1429,7 +1429,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.31.3 => k8s.io/cloud-provider v0.31.3 +# k8s.io/cloud-provider v0.31.6 => k8s.io/cloud-provider v0.31.6 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1445,7 +1445,7 @@ k8s.io/cloud-provider/names k8s.io/cloud-provider/node/helpers k8s.io/cloud-provider/options k8s.io/cloud-provider/service/helpers -# k8s.io/component-base v0.31.3 => k8s.io/component-base v0.31.3 +# k8s.io/component-base v0.31.6 => k8s.io/component-base v0.31.6 ## explicit; go 1.22.0 k8s.io/component-base/cli/flag k8s.io/component-base/config @@ -1468,13 +1468,13 @@ k8s.io/component-base/metrics/testutil k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version -# k8s.io/component-helpers v0.31.3 => k8s.io/component-helpers v0.31.3 +# k8s.io/component-helpers v0.31.6 => k8s.io/component-helpers v0.31.6 ## explicit; go 1.22.0 k8s.io/component-helpers/node/util k8s.io/component-helpers/node/util/sysctl k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity -# k8s.io/controller-manager v0.31.3 => k8s.io/controller-manager v0.31.3 +# k8s.io/controller-manager v0.31.6 => k8s.io/controller-manager v0.31.6 ## explicit; go 1.22.0 k8s.io/controller-manager/config k8s.io/controller-manager/config/v1 @@ -1497,7 +1497,7 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.0-alpha.0 => k8s.io/kms v0.31.3 +# k8s.io/kms v0.32.0-alpha.0 => k8s.io/kms v0.31.6 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 @@ -1524,15 +1524,15 @@ k8s.io/kube-openapi/pkg/validation/errors k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson -# k8s.io/kubectl v0.31.1 => k8s.io/kubectl v0.31.3 +# k8s.io/kubectl v0.31.1 => k8s.io/kubectl v0.31.6 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/scale k8s.io/kubectl/pkg/util/podutils -# k8s.io/kubelet v0.31.3 => k8s.io/kubelet v0.31.3 +# k8s.io/kubelet v0.31.6 => k8s.io/kubelet v0.31.6 ## explicit; go 1.22.0 k8s.io/kubelet/pkg/apis k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.31.1 => k8s.io/kubernetes v1.31.3 +# k8s.io/kubernetes v1.31.1 => k8s.io/kubernetes v1.31.6 ## explicit; go 1.22.0 k8s.io/kubernetes/pkg/api/legacyscheme k8s.io/kubernetes/pkg/api/service @@ -1603,7 +1603,7 @@ k8s.io/kubernetes/test/utils/kubeconfig # k8s.io/mount-utils v0.32.0 ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.31.1 => k8s.io/pod-security-admission v0.31.3 +# k8s.io/pod-security-admission v0.31.1 => k8s.io/pod-security-admission v0.31.6 ## explicit; go 1.22.0 k8s.io/pod-security-admission/api k8s.io/pod-security-admission/policy @@ -1797,35 +1797,35 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 -# k8s.io/api => k8s.io/api v0.31.3 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3 -# k8s.io/apimachinery => k8s.io/apimachinery v0.31.3 -# k8s.io/apiserver => k8s.io/apiserver v0.31.3 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3 -# k8s.io/client-go => k8s.io/client-go v0.31.3 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3 -# k8s.io/code-generator => k8s.io/code-generator v0.31.3 -# k8s.io/component-base => k8s.io/component-base v0.31.3 -# k8s.io/component-helpers => k8s.io/component-helpers v0.31.3 -# k8s.io/controller-manager => k8s.io/controller-manager v0.31.3 -# k8s.io/cri-api => k8s.io/cri-api v0.31.3 -# k8s.io/cri-client => k8s.io/cri-client v0.31.3 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3 -# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3 -# k8s.io/endpointslice => k8s.io/endpointslice v0.31.3 -# k8s.io/kms => k8s.io/kms v0.31.3 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3 -# k8s.io/kubectl => k8s.io/kubectl v0.31.3 -# k8s.io/kubelet => k8s.io/kubelet v0.31.3 -# k8s.io/kubernetes => k8s.io/kubernetes v1.31.3 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3 -# k8s.io/metrics => k8s.io/metrics v0.31.3 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3 -# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3 -# k8s.io/sample-controller => k8s.io/sample-controller v0.31.3 +# k8s.io/api => k8s.io/api v0.31.6 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6 +# k8s.io/apimachinery => k8s.io/apimachinery v0.31.6 +# k8s.io/apiserver => k8s.io/apiserver v0.31.6 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.6 +# k8s.io/client-go => k8s.io/client-go v0.31.6 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6 +# k8s.io/code-generator => k8s.io/code-generator v0.31.6 +# k8s.io/component-base => k8s.io/component-base v0.31.6 +# k8s.io/component-helpers => k8s.io/component-helpers v0.31.6 +# k8s.io/controller-manager => k8s.io/controller-manager v0.31.6 +# k8s.io/cri-api => k8s.io/cri-api v0.31.6 +# k8s.io/cri-client => k8s.io/cri-client v0.31.6 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6 +# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6 +# k8s.io/endpointslice => k8s.io/endpointslice v0.31.6 +# k8s.io/kms => k8s.io/kms v0.31.6 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6 +# k8s.io/kubectl => k8s.io/kubectl v0.31.6 +# k8s.io/kubelet => k8s.io/kubelet v0.31.6 +# k8s.io/kubernetes => k8s.io/kubernetes v1.31.6 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.6 +# k8s.io/metrics => k8s.io/metrics v0.31.6 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6 +# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.6 +# k8s.io/sample-controller => k8s.io/sample-controller v0.31.6 # sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1