github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

test: Remove final user of startup-script image

Browse Source 
It can be replaced with nc in busybox like other tests.
This commit is contained in:
Clayton Coleman 2020-03-26 22:31:02 -04:00
parent 708dd2ea7a
commit acb242f99c
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/network/kube_proxy.go
View File

@ -229,7 +229,7 @@ var _ = SIGDescribe("Network", func() {
// a problem where spurious retransmits in a long-running TCP connection to a service // a problem where spurious retransmits in a long-running TCP connection to a service
// IP could result in the connection being closed with the error "Connection reset by // IP could result in the connection being closed with the error "Connection reset by
// peer" // peer"
ginkgo.It("should resolve connrection reset issue #74839 [Slow]", func() { ginkgo.It("should resolve connection reset issue #74839 [Slow]", func() {
serverLabel := map[string]string{ serverLabel := map[string]string{
"app": "boom-server", "app": "boom-server",
} }
@ -304,7 +304,7 @@ var _ = SIGDescribe("Network", func() {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "startup-script", Name: "startup-script",
Image: imageutils.GetE2EImage(imageutils.StartupScript), Image: imageutils.GetE2EImage(imageutils.BusyBox),
Command: []string{ Command: []string{
"bash", "-c", "while true; do sleep 2; nc boom-server 9000& done", "bash", "-c", "while true; do sleep 2; nc boom-server 9000& done",
}, },

14
test/utils/image/manifest.go
View File

@ -35,6 +35,7 @@ type RegistryList struct {
InvalidRegistry string `yaml:"invalidRegistry"` InvalidRegistry string `yaml:"invalidRegistry"`
GcRegistry string `yaml:"gcRegistry"` GcRegistry string `yaml:"gcRegistry"`
GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"` GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"`
// TODO: The last consumer of this has been removed and it should be deprecated
GoogleContainerRegistry string `yaml:"googleContainerRegistry"` GoogleContainerRegistry string `yaml:"googleContainerRegistry"`
PrivateRegistry string `yaml:"privateRegistry"` PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"` SampleRegistry string `yaml:"sampleRegistry"`
@ -71,10 +72,11 @@ func initReg() RegistryList {
DockerGluster: "docker.io/gluster", DockerGluster: "docker.io/gluster",
E2eRegistry: "gcr.io/kubernetes-e2e-test-images", E2eRegistry: "gcr.io/kubernetes-e2e-test-images",
// TODO: After the domain flip, this should instead be k8s.gcr.io/k8s-artifacts-prod/e2e-test-images // TODO: After the domain flip, this should instead be k8s.gcr.io/k8s-artifacts-prod/e2e-test-images
PromoterE2eRegistry: "us.gcr.io/k8s-artifacts-prod/e2e-test-images", PromoterE2eRegistry: "us.gcr.io/k8s-artifacts-prod/e2e-test-images",
InvalidRegistry: "invalid.com/invalid", InvalidRegistry: "invalid.com/invalid",
GcRegistry: "k8s.gcr.io", GcRegistry: "k8s.gcr.io",
GcrReleaseRegistry: "gcr.io/gke-release", GcrReleaseRegistry: "gcr.io/gke-release",
// TODO: The last consumer of this has been removed and it should be deleted
GoogleContainerRegistry: "gcr.io/google-containers", GoogleContainerRegistry: "gcr.io/google-containers",
PrivateRegistry: "gcr.io/k8s-authenticated-test", PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples", SampleRegistry: "gcr.io/google-samples",
@ -107,7 +109,6 @@ var (
gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry gcAuthenticatedRegistry = registry.GcAuthenticatedRegistry
gcRegistry = registry.GcRegistry gcRegistry = registry.GcRegistry
gcrReleaseRegistry = registry.GcrReleaseRegistry gcrReleaseRegistry = registry.GcrReleaseRegistry
googleContainerRegistry = registry.GoogleContainerRegistry
invalidRegistry = registry.InvalidRegistry invalidRegistry = registry.InvalidRegistry
quayK8sCSI = registry.QuayK8sCSI quayK8sCSI = registry.QuayK8sCSI
quayIncubator = registry.QuayIncubator quayIncubator = registry.QuayIncubator
@ -191,8 +192,6 @@ const (
ResourceConsumer ResourceConsumer
// SdDummyExporter image // SdDummyExporter image
SdDummyExporter SdDummyExporter
// StartupScript image
StartupScript
// VolumeNFSServer image // VolumeNFSServer image
VolumeNFSServer VolumeNFSServer
// VolumeISCSIServer image // VolumeISCSIServer image
@ -241,7 +240,6 @@ func initImageConfigs() map[int]Config {
configs[RegressionIssue74839] = Config{e2eRegistry, "regression-issue-74839-amd64", "1.0"} configs[RegressionIssue74839] = Config{e2eRegistry, "regression-issue-74839-amd64", "1.0"}
configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"} configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"}
configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"} configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"}
configs[StartupScript] = Config{googleContainerRegistry, "startup-script", "v1"}
configs[VolumeNFSServer] = Config{e2eRegistry, "volume/nfs", "1.0"} configs[VolumeNFSServer] = Config{e2eRegistry, "volume/nfs", "1.0"}
configs[VolumeISCSIServer] = Config{e2eRegistry, "volume/iscsi", "2.0"} configs[VolumeISCSIServer] = Config{e2eRegistry, "volume/iscsi", "2.0"}
configs[VolumeGlusterServer] = Config{e2eRegistry, "volume/gluster", "1.0"} configs[VolumeGlusterServer] = Config{e2eRegistry, "volume/gluster", "1.0"}