Merge pull request #110840 from aojea/echoserver

Remove e2e echoserver image and replace it by agnost
kubernetes · Jun 30, 2022 · d2cea94 · d2cea94
2 parents 9827435 + 092f7f6
commit d2cea94
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 781 deletions.
diff --git a/test/e2e/framework/ingress/ingress_utils.go b/test/e2e/framework/ingress/ingress_utils.go
@@ -1104,8 +1104,15 @@ func generateBacksideHTTPSServiceSpec() *v1.Service {
 
 func generateBacksideHTTPSDeploymentSpec() *appsv1.Deployment {
 	labels := map[string]string{"app": "echoheaders-https"}
-	d := e2edeployment.NewDeployment("echoheaders-https", 0, labels, "echoheaders-https", imageutils.GetE2EImage(imageutils.EchoServer), appsv1.RollingUpdateDeploymentStrategyType)
+	d := e2edeployment.NewDeployment("echoheaders-https", 0, labels, "echoheaders-https", imageutils.GetE2EImage(imageutils.Agnhost), appsv1.RollingUpdateDeploymentStrategyType)
 	d.Spec.Replicas = nil
+	d.Spec.Template.Spec.Containers[0].Command = []string{
+		"/agnhost",
+		"netexec",
+		"--http-port=8443",
+		"--tls-cert-file=/localhost.crt",
+		"--tls-private-key-file=/localhost.key",
+	}
 	d.Spec.Template.Spec.Containers[0].Ports = []v1.ContainerPort{{
 		ContainerPort: 8443,
 		Name:          "echo-443",

diff --git a/test/e2e/network/scale/ingress.go b/test/e2e/network/scale/ingress.go
@@ -29,12 +29,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	clientset "k8s.io/client-go/kubernetes"
-	imageutils "k8s.io/kubernetes/test/utils/image"
 
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
 	e2eingress "k8s.io/kubernetes/test/e2e/framework/ingress"
 	"k8s.io/kubernetes/test/e2e/framework/providers/gce"
+	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
 const (
@@ -448,7 +448,12 @@ func generateScaleTestServiceSpec(suffix string) *v1.Service {
 func generateScaleTestBackendDeploymentSpec(numReplicas int32) *appsv1.Deployment {
 	d := e2edeployment.NewDeployment(
 		scaleTestBackendName, numReplicas, scaleTestLabels, scaleTestBackendName,
-		imageutils.GetE2EImage(imageutils.EchoServer), appsv1.RollingUpdateDeploymentStrategyType)
+		imageutils.GetE2EImage(imageutils.Agnhost), appsv1.RollingUpdateDeploymentStrategyType)
+	d.Spec.Template.Spec.Containers[0].Command = []string{
+		"/agnhost",
+		"netexec",
+		"--http-port=8080",
+	}
 	d.Spec.Template.Spec.Containers[0].Ports = []v1.ContainerPort{{ContainerPort: 8080}}
 	d.Spec.Template.Spec.Containers[0].ReadinessProbe = &v1.Probe{
 		ProbeHandler: v1.ProbeHandler{

diff --git a/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml
@@ -11,6 +11,12 @@ spec:
     spec:
       containers:
       - name: echoheaders-https
-        image: registry.k8s.io/e2e-test-images/echoserver:2.3
+        image: registry.k8s.io/e2e-test-images/agnhost:2.39
+        command:
+        - /agnhost
+        - netexec
+        - --http-port=8080
+        - --tls-cert-file=/localhost.crt
+        - --tls-private-key-file=/localhost.key
         ports:
         - containerPort: 8080
diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml
@@ -11,7 +11,11 @@ spec:
     spec:
       containers:
       - name: echoheaders
-        image: registry.k8s.io/e2e-test-images/echoserver:2.3
+        image: registry.k8s.io/e2e-test-images/agnhost:2.39
+        command:
+        - /agnhost
+        - netexec
+        - --http-port=8080
         ports:
         - containerPort: 8080
         readinessProbe:

diff --git a/test/e2e/testing-manifests/ingress/http2/rc.yaml b/test/e2e/testing-manifests/ingress/http2/rc.yaml
@@ -14,6 +14,12 @@ spec:
     spec:
       containers:
       - name: echoheaders
-        image: registry.k8s.io/e2e-test-images/echoserver:2.3
+        image: registry.k8s.io/e2e-test-images/agnhost:2.39
+        command:
+        - /agnhost
+        - netexec
+        - --http-port=8443
+        - --tls-cert-file=/localhost.crt
+        - --tls-private-key-file=/localhost.key
         ports:
         - containerPort: 8443
diff --git a/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml b/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml
@@ -11,6 +11,12 @@ spec:
     spec:
       containers:
       - name: echoheaders-https
-        image: registry.k8s.io/e2e-test-images/echoserver:2.3
+        image: registry.k8s.io/e2e-test-images/agnhost:2.39
+        command:
+        - /agnhost
+        - netexec
+        - --http-port=8080
+        - --tls-cert-file=/localhost.crt
+        - --tls-private-key-file=/localhost.key
         ports:
         - containerPort: 8080
diff --git a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml
@@ -11,6 +11,12 @@ spec:
     spec:
       containers:
       - name: echoheaders-https
-        image: registry.k8s.io/e2e-test-images/echoserver:2.3
+        image: registry.k8s.io/e2e-test-images/agnhost:2.39
+        command:
+        - /agnhost
+        - netexec
+        - --http-port=8080
+        - --tls-cert-file=/localhost.crt
+        - --tls-private-key-file=/localhost.key
         ports:
         - containerPort: 8080
diff --git a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml
@@ -11,6 +11,12 @@ spec:
     spec:
       containers:
       - name: echoheaders-https
-        image: registry.k8s.io/e2e-test-images/echoserver:2.3
+        image: registry.k8s.io/e2e-test-images/agnhost:2.39
+        command:
+        - /agnhost
+        - netexec
+        - --http-port=8080
+        - --tls-cert-file=/localhost.crt
+        - --tls-private-key-file=/localhost.key
         ports:
         - containerPort: 8080
diff --git a/test/images/echoserver/BASEIMAGE b/test/images/echoserver/BASEIMAGE
diff --git a/test/images/echoserver/Dockerfile b/test/images/echoserver/Dockerfile
diff --git a/test/images/echoserver/Dockerfile_windows b/test/images/echoserver/Dockerfile_windows
diff --git a/test/images/echoserver/OWNERS b/test/images/echoserver/OWNERS
diff --git a/test/images/echoserver/README.md b/test/images/echoserver/README.md
diff --git a/test/images/echoserver/VERSION b/test/images/echoserver/VERSION
diff --git a/test/images/echoserver/install-deps.sh b/test/images/echoserver/install-deps.sh
diff --git a/test/images/echoserver/nginx.conf b/test/images/echoserver/nginx.conf
diff --git a/test/images/echoserver/run.sh b/test/images/echoserver/run.sh