Skip to content

Commit 2601ca1

Browse files
Merge pull request #129602 from aravindhp/automated-cherry-pick-of-#129599-upstream-release-1.30
Automated cherry pick of #129599: Automated cherry pick of #129595: kubelet: use env vars in node log query PS command Kubernetes-commit: 45f4ccc2153bbb782253704cbe24c05e22b5d60c
1 parent 2594979 commit 2601ca1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ require (
99
github.com/gogo/protobuf v1.3.2
1010
github.com/stretchr/testify v1.8.4
1111
google.golang.org/grpc v1.58.3
12-
k8s.io/api v0.0.0-20240405200954-d014286182f6
13-
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16
14-
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f
15-
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f
12+
k8s.io/api v0.0.0-20240822113641-f67709f69651
13+
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c
14+
k8s.io/apiserver v0.0.0-20250109141431-1bd1f73f8f93
15+
k8s.io/client-go v0.0.0-20240826073909-8a9438e118ca
1616
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102
1717
k8s.io/cri-api v0.0.0-20240405203557-7e1a55b9a18b
1818
k8s.io/klog/v2 v2.120.1

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
155155
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
156156
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
157157
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
158-
k8s.io/api v0.0.0-20240405200954-d014286182f6 h1:D+8jSRFaZCyBrxoU33jNMTIXrTLHt6/WSsfRXttR384=
159-
k8s.io/api v0.0.0-20240405200954-d014286182f6/go.mod h1:72LmHV9KJWB464cJMYgnWZqh3GiKgX70hjmgoYjR67Y=
160-
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16 h1:GjoXk5Gb8LqhZJjGbYOqIw8JbuDJZv9MKd94i2DXzg8=
161-
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
162-
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f h1:JxhHFeNTB4uDnUdLHAlj4yqYaLFbchNUr2cHYIuYY6w=
163-
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f/go.mod h1:qQmcIz9MzZvE5CB6F8uTtGMFlOKrowA4xWPJmS30J54=
164-
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f h1:Db7qKhB5C0hFLkG/JIiSMJJo9nYgl3M0oLfA+87MgUE=
165-
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f/go.mod h1:b74WgxBhDtN8IQcRO+B6p2Lyt/XBiJNBaROf1gEuAlg=
158+
k8s.io/api v0.0.0-20240822113641-f67709f69651 h1:Fyzq7cbnP/BCOiXvMJSKU6z6y+e56OSVnfisR5EhZj0=
159+
k8s.io/api v0.0.0-20240822113641-f67709f69651/go.mod h1:D+mc/RogNsJPV6ktCtgP7gZhbRsOGp/7lCeMXY1t8kE=
160+
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c h1:PMvIiEyO6vNoHQCaeMmLduktIYCbou73s3P2+bHi0WE=
161+
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
162+
k8s.io/apiserver v0.0.0-20250109141431-1bd1f73f8f93 h1:FR5fubLgsX5oiRHYvCO0C2j4Y38lKIh0vRZe0R8RGFs=
163+
k8s.io/apiserver v0.0.0-20250109141431-1bd1f73f8f93/go.mod h1:aU0C0PWLq3wQDQ2ATq6tics/EIar9F7zFbNlAPB099o=
164+
k8s.io/client-go v0.0.0-20240826073909-8a9438e118ca h1:yXLbQ3X1qLgSW2kl3QWvuj5UXhh0VHYHkkqlqkbw1E4=
165+
k8s.io/client-go v0.0.0-20240826073909-8a9438e118ca/go.mod h1:2iNVyiyD9ILvu7JFmeXErwqXjHvL1amqkcvgYYA2/54=
166166
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102 h1:0cfcZldzLbU9OCTNggwWSvwbmpfndqVA5FpzAdv2PZM=
167167
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102/go.mod h1:OrSEiAhqqeoSGHJ4Crsw944Vq0tZpH2V7ULhDnF1ymg=
168168
k8s.io/cri-api v0.0.0-20240405203557-7e1a55b9a18b h1:1HtZtK1sU4DcAxVjolslJgY5rwmkvIBZQ12zCzl6nz0=

0 commit comments

Comments
 (0)