kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109123 from dims/switch-to-pause-3.7 

Switch to pause 3.7 for Kubernetes 1.24

Kubernetes-commit: e4690b0fbcedcdc7d42902aaa5d98c1804d05d33
This commit is contained in:
Kubernetes Publisher 2022-03-29 20:37:39 -07:00
parent 5a37c45ce2 f57c533e36
commit b2aa907214
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -32,7 +32,7 @@ require (
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220330051021-b754a94214be
k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12
k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8
k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092
k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a
@ -49,7 +49,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220330051021-b754a94214be
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8
k8s.io/client-go => k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220330050606-8f17de063761

4
go.sum
View File

@ -880,8 +880,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220330051021-b754a94214be h1:UnXBdsSVy3e2Y6cyf9rVmzn0wPXyoUuGIZAM43vdTj0=
k8s.io/api v0.0.0-20220330051021-b754a94214be/go.mod h1:gL+2VXubbVTH6gK18uLau2gxoDmu43bdiQmz5TTa3zw=
k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12 h1:+Cp1h0ojFtOluw7Bgiju2A/LqoWzeYyaB+sY/YSflwE=
k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444 h1:whQmS3GtF822OUer+LPJnMFKn6kPfuJOCM/3xUuATIY=
k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8 h1:ZbBnGPg/KemzGqilVYDFeTKsFfWPiwmB+bG4JtFQi9Q=
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8/go.mod h1:7rS4pOeS253kcv+ZA4KJZmQV16OU/VC+Kr0xt/TRMbc=
k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092 h1:juuWgiTcvrIkUVtF+C5CYsVA0YK7eNA6M/uD1J4WxNU=

4
testdata/set/multi-resource-yaml.yaml vendored
View File

@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.6
image: k8s.gcr.io/pause:3.7
---
apiVersion: v1
kind: ReplicationController
@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.6
image: k8s.gcr.io/pause:3.7

2
testdata/set/namespaced-resource.yaml vendored
View File

@ -14,4 +14,4 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.6
image: k8s.gcr.io/pause:3.7