From cdc3c192a1180e1921806267985e35a5c3fcb2da Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 14 Jan 2025 10:26:35 -0800 Subject: [PATCH] Merge pull request #129599 from aravindhp/automated-cherry-pick-of-#129595-upstream-release-1.31 Automated cherry pick of #129595: kubelet: use env vars in node log query PS command Kubernetes-commit: 75c83a6871dc030675288c6d63c275a43c2f0d55 --- go.mod | 14 +++++--------- go.sum | 16 ++++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 056200e4..9d0b0375 100644 --- a/go.mod +++ b/go.mod @@ -9,11 +9,11 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.9.0 google.golang.org/grpc v1.65.0 - k8s.io/api v0.0.0-20240723194852-3421a80713ae - k8s.io/apimachinery v0.0.0-20240720202316-95b78024e3fe - k8s.io/apiserver v0.0.0-20240723030233-2b2a4b0fa8e4 - k8s.io/client-go v0.0.0-20240723200359-dcfcc90795cc - k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440 + k8s.io/api v0.0.0-20240827081448-46f6230a4e83 + k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe + k8s.io/apiserver v0.0.0-20250109161631-b39cc9a1ad4a + k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9 + k8s.io/component-base v0.0.0-20240801005513-6332889bcf10 k8s.io/cri-api v0.0.0-20240624083443-3e7bd20f8b96 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 @@ -59,7 +59,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) - -replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe - -replace k8s.io/kms => k8s.io/kms v0.0.0-20240801005948-e16c35c51bb1 diff --git a/go.sum b/go.sum index 89673a3e..683efacb 100644 --- a/go.sum +++ b/go.sum @@ -151,16 +151,16 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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.0.0-20240723194852-3421a80713ae h1:mV43yijQh5/Wf7fwSuyATasDFY+YJxjuXs1ecY5M1Bc= -k8s.io/api v0.0.0-20240723194852-3421a80713ae/go.mod h1:ytlEzqC2wOTwYET71W7+J+k7O2V7vrDuzmNLBSpgT+k= +k8s.io/api v0.0.0-20240827081448-46f6230a4e83 h1:EHuPy/62w9Llhp491zNknjEuET9oMPQPPSAatwaM2NA= +k8s.io/api v0.0.0-20240827081448-46f6230a4e83/go.mod h1:sSxNOmsgxkyv9k7Nu9ysVYNCkTkTemOgz4HxbATSKDQ= k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe h1:lt6b7CTEYMgUTCGIZrATyWMZTQThE+qIQq5YTCbpMVQ= k8s.io/apimachinery v0.0.0-20240719190441-a8f449e276fe/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.0.0-20240723030233-2b2a4b0fa8e4 h1:7nrffLiDUbMAXLKzBvyU8rwLHw5WpCw2AjhDO5IZYRs= -k8s.io/apiserver v0.0.0-20240723030233-2b2a4b0fa8e4/go.mod h1:R1HYbPCD+ClvTmzeLBYaS4aktC3entK1o4hyD+WemtA= -k8s.io/client-go v0.0.0-20240723200359-dcfcc90795cc h1:qe0SREEjfE5w3ANvrSURWv00J/ISlqa9Sa3FCBYKRlg= -k8s.io/client-go v0.0.0-20240723200359-dcfcc90795cc/go.mod h1:XfEsPNNFOR0wNkr3BtkPUN668l7Sx1W4ECSUolQ0mA4= -k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440 h1:14X+5sRQRsul6tLxIKTP0/DotvWlMd9DFCgMqHP1hZY= -k8s.io/component-base v0.0.0-20240722183709-6cc953a9d440/go.mod h1:dj2Pl05aLcVMZi2NXcwv+M/WdUVPEkisFPjDze7rbSk= +k8s.io/apiserver v0.0.0-20250109161631-b39cc9a1ad4a h1:MOrNwyddF1irHM+EFLfEK8bmDcokFMAMGPA8OQna2u8= +k8s.io/apiserver v0.0.0-20250109161631-b39cc9a1ad4a/go.mod h1:uG4IlDFlnCyiEoaG8HiOlmZQylx4DO2fdMXePoP64y8= +k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9 h1:FtksMSsr8nNBmsSXlqvs3hPE/7BJ5wI/mJYjGypoEtk= +k8s.io/client-go v0.0.0-20240801004130-5e3e8ea98fe9/go.mod h1:2bbCJ3Sd+yFlCoexz86XNKsJ8hBFUVTeHsjEhrODbfE= +k8s.io/component-base v0.0.0-20240801005513-6332889bcf10 h1:tHph4IwKpAlb5BF1qvmAiZPsekcg7ulTIhHrGrw/OgY= +k8s.io/component-base v0.0.0-20240801005513-6332889bcf10/go.mod h1:4BSQhq9G+cFOChP5FQhxewvI8nzmsOPyetLz/Gh2Npw= k8s.io/cri-api v0.0.0-20240624083443-3e7bd20f8b96 h1:P0X5pqYdlMP1Isu1EqUPK41nEuNSX5dDei0Q/UbGWuI= k8s.io/cri-api v0.0.0-20240624083443-3e7bd20f8b96/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=