Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bf0a637

Browse files
mkumatagmkumatag
committed
Multi Arch test support
1 parent 4d2a721 commit bf0a637

111 files changed

Lines changed: 735 additions & 335 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/guestbook/frontend-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
spec:
1313
containers:
1414
- name: php-redis
15-
image: gcr.io/google-samples/gb-frontend:v4
15+
image: {{frontendImage}}
1616
resources:
1717
requests:
1818
cpu: 100m

‎examples/guestbook/redis-master-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: master
16-
image: gcr.io/google_containers/redis:e2e # or just image: redis
16+
image: {{redisImage}} # or just image: redis
1717
resources:
1818
requests:
1919
cpu: 100m

‎examples/guestbook/redis-slave-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: slave
16-
image: gcr.io/google_samples/gb-redisslave:v1
16+
image: {{redisslaveImage}}
1717
resources:
1818
requests:
1919
cpu: 100m

‎hack/verify-flags/exceptions.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,26 +141,26 @@ pkg/util/oom/oom_linux.go: return fmt.Errorf("invalid PID %d specified for oom_
141141
pkg/util/oom/oom_linux.go: oomScoreAdjPath := path.Join("/proc", pidStr, "oom_score_adj")
142142
pkg/util/oom/oom_linux.go:// Writes 'value' to /proc/<pid>/oom_score_adj for all processes in cgroup cgroupName.
143143
pkg/util/oom/oom_linux.go:// Writes 'value' to /proc/<pid>/oom_score_adj. PID = 0 means self
144-
test/e2e/common/configmap.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volume/data-1"},
145-
test/e2e/common/configmap.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/create/data-1"},
146-
test/e2e/common/configmap.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/delete/data-1"},
147-
test/e2e/common/configmap.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/update/data-3"},
148-
test/e2e/common/downwardapi_volume.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath},
144+
test/e2e/common/configmap.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volume/data-1"},
145+
test/e2e/common/configmap.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/create/data-1"},
146+
test/e2e/common/configmap.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/delete/data-1"},
147+
test/e2e/common/configmap.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/configmap-volumes/update/data-3"},
148+
test/e2e/common/downwardapi_volume.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath},
149149
test/e2e/common/host_path.go: fmt.Sprintf("--file_content_in_loop=%v", filePath),
150150
test/e2e/common/host_path.go: fmt.Sprintf("--file_content_in_loop=%v", filePathInReader),
151151
test/e2e/common/host_path.go: fmt.Sprintf("--retry_time=%d", retryDuration),
152152
test/e2e/common/host_path.go: fmt.Sprintf("--retry_time=%d", retryDuration),
153-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volume/data-1"},
154-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volumes/create/data-1"},
155-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volumes/delete/data-1"},
156-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volumes/update/data-3"},
157-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-secret-volumes/create/data-1"},
158-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-secret-volumes/delete/data-1"},
159-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-secret-volumes/update/data-3"},
160-
test/e2e/common/projected.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath},
161-
test/e2e/common/secrets.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/create/data-1"},
162-
test/e2e/common/secrets.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/delete/data-1"},
163-
test/e2e/common/secrets.go: Command: []string{"/mt", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/update/data-3"},
153+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volume/data-1"},
154+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volumes/create/data-1"},
155+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volumes/delete/data-1"},
156+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-configmap-volumes/update/data-3"},
157+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-secret-volumes/create/data-1"},
158+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-secret-volumes/delete/data-1"},
159+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/projected-secret-volumes/update/data-3"},
160+
test/e2e/common/projected.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath},
161+
test/e2e/common/secrets.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/create/data-1"},
162+
test/e2e/common/secrets.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/delete/data-1"},
163+
test/e2e/common/secrets.go: Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=/etc/secret-volumes/update/data-3"},
164164
test/e2e/no-snat.go: node_ip := v1.EnvVar{
165165
test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be %d; found %d", pid, expectedOOMScoreAdj, oomScore)
166166
test/e2e_node/container_manager_test.go: return fmt.Errorf("expected pid %d's oom_score_adj to be < %d; found %d", pid, expectedMaxOOMScoreAdj, oomScore)

‎test/e2e/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ go_library(
117117
"//test/e2e_federation:go_default_library",
118118
"//test/images/net/nat:go_default_library",
119119
"//test/utils:go_default_library",
120+
"//test/utils/imagemanifest:go_default_library",
121+
"//test/utils/junit:go_default_library",
120122
"//vendor/github.com/golang/glog:go_default_library",
121123
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
122124
"//vendor/github.com/onsi/ginkgo:go_default_library",

‎test/e2e/apimachinery/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ go_library(
2929
"//test/e2e/framework:go_default_library",
3030
"//test/e2e/metrics:go_default_library",
3131
"//test/utils:go_default_library",
32+
"//test/utils/imagemanifest:go_default_library",
3233
"//vendor/github.com/onsi/ginkgo:go_default_library",
3334
"//vendor/github.com/onsi/gomega:go_default_library",
3435
"//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",

‎test/e2e/apimachinery/garbage_collector.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333

3434
. "github.com/onsi/ginkgo"
3535
. "github.com/onsi/gomega"
36+
"k8s.io/kubernetes/test/utils/imagemanifest"
3637
)
3738

3839
func getForegroundOptions() *metav1.DeleteOptions {
@@ -61,7 +62,7 @@ var podTemplateSpec = v1.PodTemplateSpec{
6162
Containers: []v1.Container{
6263
{
6364
Name: "nginx",
64-
Image: "gcr.io/google_containers/nginx-slim:0.7",
65+
Image: imagemanifest.GetnginxSlimImage(),
6566
},
6667
},
6768
},
@@ -159,7 +160,7 @@ func newGCPod(name string) *v1.Pod {
159160
Containers: []v1.Container{
160161
{
161162
Name: "nginx",
162-
Image: "gcr.io/google_containers/nginx:1.7.9",
163+
Image: imagemanifest.GetnginxSlimImage(),
163164
},
164165
},
165166
},

‎test/e2e/apimachinery/initializers.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
clientset "k8s.io/client-go/kubernetes"
3333
clientretry "k8s.io/kubernetes/pkg/client/retry"
3434
"k8s.io/kubernetes/test/e2e/framework"
35+
"k8s.io/kubernetes/test/utils/imagemanifest"
3536
)
3637

3738
var _ = SIGDescribe("Initializers", func() {
@@ -228,7 +229,7 @@ func newInitPod(podName string) *v1.Pod {
228229
Containers: []v1.Container{
229230
{
230231
Name: containerName,
231-
Image: "gcr.io/google_containers/porter:4524579c0eb935c056c8e75563b4e1eda31587e0",
232+
Image: imagemanifest.GetporterImage(),
232233
Env: []v1.EnvVar{{Name: fmt.Sprintf("SERVE_PORT_%d", port), Value: "foo"}},
233234
Ports: []v1.ContainerPort{{ContainerPort: int32(port)}},
234235
},

‎test/e2e/apimachinery/table_conversion.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1"
3131
"k8s.io/kubernetes/pkg/printers"
3232
"k8s.io/kubernetes/test/e2e/framework"
33+
"k8s.io/kubernetes/test/utils/imagemanifest"
3334
)
3435

3536
var _ = SIGDescribe("Servers with support for Table transformation", func() {
@@ -110,7 +111,7 @@ func newTablePod(podName string) *v1.Pod {
110111
Containers: []v1.Container{
111112
{
112113
Name: containerName,
113-
Image: "gcr.io/google_containers/porter:4524579c0eb935c056c8e75563b4e1eda31587e0",
114+
Image: imagemanifest.GetporterImage(),
114115
Env: []v1.EnvVar{{Name: fmt.Sprintf("SERVE_PORT_%d", port), Value: "foo"}},
115116
Ports: []v1.ContainerPort{{ContainerPort: int32(port)}},
116117
},

‎test/e2e/apps/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ go_library(
4242
"//plugin/pkg/scheduler/schedulercache:go_default_library",
4343
"//test/e2e/framework:go_default_library",
4444
"//test/utils:go_default_library",
45+
"//test/utils/imagemanifest:go_default_library",
4546
"//vendor/github.com/davecgh/go-spew/spew:go_default_library",
4647
"//vendor/github.com/onsi/ginkgo:go_default_library",
4748
"//vendor/github.com/onsi/gomega:go_default_library",

0 commit comments

Comments
 (0)