mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 18:31:15 +00:00
update pause image 3.4.1 for hack testdatas only
Signed-off-by: pacoxu <paco.xu@daocloud.io>
This commit is contained in:
parent
081f68d685
commit
8811275ea4
2
hack/testdata/filter/pod-apply-selector.yaml
vendored
2
hack/testdata/filter/pod-apply-selector.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/filter/pod-dont-apply.yaml
vendored
2
hack/testdata/filter/pod-dont-apply.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/multi-resource-1.yaml
vendored
2
hack/testdata/multi-resource-1.yaml
vendored
@ -11,7 +11,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
|
6
hack/testdata/multi-resource-3.yaml
vendored
6
hack/testdata/multi-resource-3.yaml
vendored
@ -8,7 +8,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
@ -17,7 +17,7 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
@ -26,5 +26,5 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
||||
|
@ -43,7 +43,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
|
2
hack/testdata/multi-resource-json.json
vendored
2
hack/testdata/multi-resource-json.json
vendored
@ -41,7 +41,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
|
@ -47,7 +47,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
|
2
hack/testdata/multi-resource-list.json
vendored
2
hack/testdata/multi-resource-list.json
vendored
@ -45,7 +45,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
|
@ -26,7 +26,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
@ -60,7 +60,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
|
4
hack/testdata/multi-resource-rclist.json
vendored
4
hack/testdata/multi-resource-rclist.json
vendored
@ -26,7 +26,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
@ -60,7 +60,7 @@
|
||||
"spec":{
|
||||
"containers":[{
|
||||
"name": "mock-container",
|
||||
"image": "k8s.gcr.io/pause:2.0",
|
||||
"image": "k8s.gcr.io/pause:3.4.1",
|
||||
"ports":[{
|
||||
"containerPort":9949,
|
||||
"protocol":"TCP"
|
||||
|
@ -29,7 +29,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
ports:
|
||||
- containerPort: 9949
|
||||
protocol: TCP
|
||||
|
2
hack/testdata/multi-resource-yaml.yaml
vendored
2
hack/testdata/multi-resource-yaml.yaml
vendored
@ -27,7 +27,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
ports:
|
||||
- containerPort: 9949
|
||||
protocol: TCP
|
||||
|
2
hack/testdata/pod-apply.yaml
vendored
2
hack/testdata/pod-apply.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/pod-changed.yaml
vendored
2
hack/testdata/pod-changed.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:3.0
|
||||
image: k8s.gcr.io/pause:3.4
|
||||
|
2
hack/testdata/pod.yaml
vendored
2
hack/testdata/pod.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/prune/a.yaml
vendored
2
hack/testdata/prune/a.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/prune/b.yaml
vendored
2
hack/testdata/prune/b.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/sorted-pods/sorted-pod1.yaml
vendored
2
hack/testdata/sorted-pods/sorted-pod1.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause2
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/sorted-pods/sorted-pod2.yaml
vendored
2
hack/testdata/sorted-pods/sorted-pod2.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause1
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
2
hack/testdata/sorted-pods/sorted-pod3.yaml
vendored
2
hack/testdata/sorted-pods/sorted-pod3.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
||||
spec:
|
||||
containers:
|
||||
- name: kubernetes-pause3
|
||||
image: k8s.gcr.io/pause:2.0
|
||||
image: k8s.gcr.io/pause:3.4.1
|
||||
|
@ -47,7 +47,7 @@ run_kubectl_diff_tests() {
|
||||
# 1. the exit code for diff is 1 because it found a difference
|
||||
# 2. the difference contains the changed image
|
||||
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml || test $? -eq 1)
|
||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
|
||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
|
||||
|
||||
# Ensure diff only dry-runs and doesn't persist change
|
||||
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
|
||||
@ -55,7 +55,7 @@ run_kubectl_diff_tests() {
|
||||
|
||||
# Test found diff with server-side apply
|
||||
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1)
|
||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
|
||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
|
||||
|
||||
# Ensure diff --server-side only dry-runs and doesn't persist change
|
||||
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
|
||||
@ -86,7 +86,7 @@ run_kubectl_diff_tests() {
|
||||
# 1. the exit code for diff is 1 because it found a difference
|
||||
# 2. the difference contains the changed image
|
||||
output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1)
|
||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
|
||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
|
||||
|
||||
# Cleanup
|
||||
kubectl delete -f hack/testdata/pod.yaml
|
||||
|
Loading…
Reference in New Issue
Block a user