diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index f296b68b9af..67f21b797fe 100644 --- a/hack/testdata/filter/pod-apply-selector.yaml +++ b/hack/testdata/filter/pod-apply-selector.yaml @@ -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 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index 9b8f9f6e900..9a272bf094e 100644 --- a/hack/testdata/filter/pod-dont-apply.yaml +++ b/hack/testdata/filter/pod-dont-apply.yaml @@ -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 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index 7acb111c78d..7062a4a9ef2 100644 --- a/hack/testdata/multi-resource-1.yaml +++ b/hack/testdata/multi-resource-1.yaml @@ -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 diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index 10929c63a82..1f1f5cf7151 100644 --- a/hack/testdata/multi-resource-3.yaml +++ b/hack/testdata/multi-resource-3.yaml @@ -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 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 2f88c0ac8e3..a5b063a95c5 100644 --- a/hack/testdata/multi-resource-json-modify.json +++ b/hack/testdata/multi-resource-json-modify.json @@ -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" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index 869fdc7cbfc..05a0496bdb2 100644 --- a/hack/testdata/multi-resource-json.json +++ b/hack/testdata/multi-resource-json.json @@ -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" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index af902efcfc3..43041d6a010 100644 --- a/hack/testdata/multi-resource-list-modify.json +++ b/hack/testdata/multi-resource-list-modify.json @@ -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" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index 17abca285aa..b0c193d6d97 100644 --- a/hack/testdata/multi-resource-list.json +++ b/hack/testdata/multi-resource-list.json @@ -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" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index a28169c8ee5..72d4312ca7c 100644 --- a/hack/testdata/multi-resource-rclist-modify.json +++ b/hack/testdata/multi-resource-rclist-modify.json @@ -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" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index a28169c8ee5..72d4312ca7c 100644 --- a/hack/testdata/multi-resource-rclist.json +++ b/hack/testdata/multi-resource-rclist.json @@ -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" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 067b75630ba..b8492f069d9 100644 --- a/hack/testdata/multi-resource-yaml-modify.yaml +++ b/hack/testdata/multi-resource-yaml-modify.yaml @@ -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 diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 642ebdb47ed..7aab9d45da9 100644 --- a/hack/testdata/multi-resource-yaml.yaml +++ b/hack/testdata/multi-resource-yaml.yaml @@ -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 diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index 235d1c8f0f3..66e9a5fddf1 100644 --- a/hack/testdata/pod-apply.yaml +++ b/hack/testdata/pod-apply.yaml @@ -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 diff --git a/hack/testdata/pod-changed.yaml b/hack/testdata/pod-changed.yaml index 69476100d3f..f08c34cf095 100644 --- a/hack/testdata/pod-changed.yaml +++ b/hack/testdata/pod-changed.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.0 + image: k8s.gcr.io/pause:3.4 diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 92b504ef77a..d29421d9f79 100644 --- a/hack/testdata/pod.yaml +++ b/hack/testdata/pod.yaml @@ -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 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index badd10caa8b..df47f2a559b 100644 --- a/hack/testdata/prune/a.yaml +++ b/hack/testdata/prune/a.yaml @@ -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 diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml index 46365d28b7a..7bb19d0c9b5 100644 --- a/hack/testdata/prune/b.yaml +++ b/hack/testdata/prune/b.yaml @@ -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 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index dd27241f95c..2a077a17f44 100644 --- a/hack/testdata/sorted-pods/sorted-pod1.yaml +++ b/hack/testdata/sorted-pods/sorted-pod1.yaml @@ -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 diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index 9a811099e6a..a046cde9674 100644 --- a/hack/testdata/sorted-pods/sorted-pod2.yaml +++ b/hack/testdata/sorted-pods/sorted-pod2.yaml @@ -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 diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index dd209a5f656..45b599b06a0 100644 --- a/hack/testdata/sorted-pods/sorted-pod3.yaml +++ b/hack/testdata/sorted-pods/sorted-pod3.yaml @@ -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 diff --git a/test/cmd/diff.sh b/test/cmd/diff.sh index 4894e62b1c8..c1e75d683fe 100755 --- a/test/cmd/diff.sh +++ b/test/cmd/diff.sh @@ -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