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

Skip to content

Commit bcefdf8

Browse files
mkumatagmkumatag
committed
Port e2e tests for multi architecture
1 parent e6ab6fc commit bcefdf8

84 files changed

Lines changed: 400 additions & 306 deletions

Some content is hidden

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

‎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+
imageutils "k8s.io/kubernetes/test/utils/image"
3637
)
3738

3839
func getForegroundOptions() *metav1.DeleteOptions {
@@ -62,7 +63,7 @@ func getPodTemplateSpec(labels map[string]string) v1.PodTemplateSpec {
6263
Containers: []v1.Container{
6364
{
6465
Name: "nginx",
65-
Image: "gcr.io/google_containers/nginx-slim:0.7",
66+
Image: imageutils.GetE2EImage(imageutils.NginxSlim),
6667
},
6768
},
6869
},
@@ -162,7 +163,7 @@ func newGCPod(name string) *v1.Pod {
162163
Containers: []v1.Container{
163164
{
164165
Name: "nginx",
165-
Image: "gcr.io/google_containers/nginx:1.7.9",
166+
Image: imageutils.GetE2EImage(imageutils.NginxSlim),
166167
},
167168
},
168169
},

‎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+
imageutils "k8s.io/kubernetes/test/utils/image"
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: imageutils.GetE2EImage(imageutils.Porter),
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+
imageutils "k8s.io/kubernetes/test/utils/image"
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: imageutils.GetE2EImage(imageutils.Porter),
114115
Env: []v1.EnvVar{{Name: fmt.Sprintf("SERVE_PORT_%d", port), Value: "foo"}},
115116
Ports: []v1.ContainerPort{{ContainerPort: int32(port)}},
116117
},

‎test/e2e/apps/cronjob.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"k8s.io/kubernetes/pkg/controller/job"
3636
"k8s.io/kubernetes/pkg/kubectl"
3737
"k8s.io/kubernetes/test/e2e/framework"
38+
imageutils "k8s.io/kubernetes/test/utils/image"
3839
)
3940

4041
const (
@@ -303,7 +304,7 @@ func newTestCronJob(name, schedule string, concurrencyPolicy batchv2alpha1.Concu
303304
Containers: []v1.Container{
304305
{
305306
Name: "c",
306-
Image: "gcr.io/google_containers/busybox:1.24",
307+
Image: imageutils.GetE2EImage(imageutils.BusyBox),
307308
VolumeMounts: []v1.VolumeMount{
308309
{
309310
MountPath: "/data",

‎test/e2e/apps/rc.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
"k8s.io/kubernetes/pkg/controller/replication"
3131
"k8s.io/kubernetes/test/e2e/framework"
32+
imageutils "k8s.io/kubernetes/test/utils/image"
3233

3334
. "github.com/onsi/ginkgo"
3435
. "github.com/onsi/gomega"
@@ -45,7 +46,7 @@ var _ = SIGDescribe("ReplicationController", func() {
4546
// requires private images
4647
framework.SkipUnlessProviderIs("gce", "gke")
4748

48-
TestReplicationControllerServeImageOrFail(f, "private", "gcr.io/k8s-authenticated-test/serve_hostname:v1.4")
49+
TestReplicationControllerServeImageOrFail(f, "private", imageutils.GetE2EImage(imageutils.ServeHostname))
4950
})
5051

5152
It("should surface a failure condition on a common issue like exceeded quota", func() {

‎test/e2e/apps/replica_set.go‎

Lines changed: 2 additions & 1 deletion
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+
imageutils "k8s.io/kubernetes/test/utils/image"
3637
)
3738

3839
func newRS(rsName string, replicas int32, rsPodLabels map[string]string, imageName string, image string) *extensions.ReplicaSet {
@@ -85,7 +86,7 @@ var _ = SIGDescribe("ReplicaSet", func() {
8586
// requires private images
8687
framework.SkipUnlessProviderIs("gce", "gke")
8788

88-
testReplicaSetServeImageOrFail(f, "private", "gcr.io/k8s-authenticated-test/serve_hostname:v1.4")
89+
testReplicaSetServeImageOrFail(f, "private", imageutils.GetE2EImage(imageutils.ServeHostname))
8990
})
9091

9192
It("should surface a failure condition on a common issue like exceeded quota", func() {

‎test/e2e/apps/statefulset.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
clientset "k8s.io/client-go/kubernetes"
3434
"k8s.io/kubernetes/pkg/controller"
3535
"k8s.io/kubernetes/test/e2e/framework"
36+
imageutils "k8s.io/kubernetes/test/utils/image"
3637
)
3738

3839
const (
@@ -777,7 +778,7 @@ var _ = SIGDescribe("StatefulSet", func() {
777778
Containers: []v1.Container{
778779
{
779780
Name: "nginx",
780-
Image: "gcr.io/google_containers/nginx-slim:0.7",
781+
Image: imageutils.GetE2EImage(imageutils.NginxSlim),
781782
Ports: []v1.ContainerPort{conflictingPort},
782783
},
783784
},

‎test/e2e/apps/types.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,20 @@ package apps
1919
import (
2020
"k8s.io/apimachinery/pkg/runtime/schema"
2121
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
22+
imageutils "k8s.io/kubernetes/test/utils/image"
2223
)
2324

2425
const (
25-
NautilusImage = "gcr.io/google_containers/update-demo:nautilus"
26-
KittenImage = "gcr.io/google_containers/update-demo:kitten"
27-
NginxImage = "gcr.io/google_containers/nginx-slim:0.7"
2826
NginxImageName = "nginx"
29-
RedisImage = "gcr.io/k8s-testimages/redis:e2e"
3027
RedisImageName = "redis"
31-
NewNginxImage = "gcr.io/google_containers/nginx-slim:0.8"
3228
)
3329

3430
var (
31+
NautilusImage = imageutils.GetE2EImage(imageutils.Nautilus)
32+
KittenImage = imageutils.GetE2EImage(imageutils.Kitten)
3533
CronJobGroupVersionResource = schema.GroupVersionResource{Group: batchv2alpha1.GroupName, Version: "v2alpha1", Resource: "cronjobs"}
34+
NginxImage = imageutils.GetE2EImage(imageutils.NginxSlim)
35+
NewNginxImage = imageutils.GetE2EImage(imageutils.NginxSlimNew)
36+
RedisImage = imageutils.GetE2EImage(imageutils.Redis)
3637
ScheduledJobGroupVersionResource = schema.GroupVersionResource{Group: batchv2alpha1.GroupName, Version: "v2alpha1", Resource: "scheduledjobs"}
3738
)

‎test/e2e/common/apparmor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ done`, testCmd)
8484
Spec: api.PodSpec{
8585
Containers: []api.Container{{
8686
Name: "test",
87-
Image: "gcr.io/google_containers/busybox:1.24",
87+
Image: busyboxImage,
8888
Command: []string{"sh", "-c", testCmd},
8989
}},
9090
RestartPolicy: api.RestartPolicyNever,

‎test/e2e/common/autoscaling_utils.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
testutils "k8s.io/kubernetes/test/utils"
3838

3939
. "github.com/onsi/ginkgo"
40+
imageutils "k8s.io/kubernetes/test/utils/image"
4041
)
4142

4243
const (
@@ -50,8 +51,6 @@ const (
5051
timeoutRC = 120 * time.Second
5152
startServiceTimeout = time.Minute
5253
startServiceInterval = 5 * time.Second
53-
resourceConsumerImage = "gcr.io/google_containers/resource_consumer:beta4"
54-
resourceConsumerControllerImage = "gcr.io/google_containers/resource_consumer/controller:beta4"
5554
rcIsNil = "ERROR: replicationController = nil"
5655
deploymentIsNil = "ERROR: deployment = nil"
5756
rsIsNil = "ERROR: replicaset = nil"
@@ -61,6 +60,11 @@ const (
6160
serviceInitializationInterval = 15 * time.Second
6261
)
6362

63+
var (
64+
resourceConsumerImage = imageutils.GetE2EImage(imageutils.ResourceConsumer)
65+
resourceConsumerControllerImage = imageutils.GetE2EImage(imageutils.ResourceController)
66+
)
67+
6468
const (
6569
KindRC = "ReplicationController"
6670
KindDeployment = "Deployment"

0 commit comments

Comments
 (0)