github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 01:40:13 +00:00
Code Issues Projects Releases Wiki Activity

replace echoserver image with agnhost

Browse Source 
agnhost contains the same features than echoserver.
This commit is contained in:
Antonio Ojea 2022-06-28 19:04:30 +02:00
parent 8f755aad55
commit 3204572f01
8 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/framework/ingress/ingress_utils.go
View File

@ -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",

9
test/e2e/network/scale/ingress.go
View File

@ -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{

8
test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml
View File

@ -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

6
test/e2e/testing-manifests/ingress/http/rc.yaml
View File

@ -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:

8
test/e2e/testing-manifests/ingress/http2/rc.yaml
View File

@ -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

8
test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml
View File

@ -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

8
test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml
View File

@ -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

8
test/e2e/testing-manifests/ingress/static-ip/rc.yaml
View File

@ -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