DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add probes to deployments used in e2e tests

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-11-29 10:53:48 -03:00
parent af714ac20f
commit 8a0dec9dd1
4 changed files with 76 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
test/e2e/framework/deployment.go
View file

@ -17,8 +17,6 @@ limitations under the License.
package framework
import (
"time"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
@ -36,7 +34,7 @@ func (f *Framework) NewEchoDeployment() {
// NewEchoDeploymentWithReplicas creates a new deployment of the echoserver image in a particular namespace. Number of
// replicas is configurable
func (f *Framework) NewEchoDeploymentWithReplicas(replicas int32) {
f.NewDeployment("http-svc", "gcr.io/kubernetes-e2e-test-images/echoserver:2.1", 8080, replicas)
f.NewDeployment("http-svc", "gcr.io/kubernetes-e2e-test-images/echoserver:2.2", 8080, replicas)
}
// NewHttpbinDeployment creates a new single replica deployment of the httpbin image in a particular namespace.
@ -46,6 +44,19 @@ func (f *Framework) NewHttpbinDeployment() {
// NewDeployment creates a new deployment in a particular namespace.
func (f *Framework) NewDeployment(name, image string, port int32, replicas int32) {
probe := &corev1.Probe{
InitialDelaySeconds: 5,
PeriodSeconds: 10,
SuccessThreshold: 1,
TimeoutSeconds: 1,
Handler: corev1.Handler{
HTTPGet: &corev1.HTTPGetAction{
Port: intstr.FromString("http"),
Path: "/",
},
},
}
deployment := &extensions.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: name,
@ -77,6 +88,8 @@ func (f *Framework) NewDeployment(name, image string, port int32, replicas int32
ContainerPort: port,
},
},
ReadinessProbe: probe,
LivenessProbe: probe,
},
},
},
@ -88,10 +101,10 @@ func (f *Framework) NewDeployment(name, image string, port int32, replicas int32
Expect(err).NotTo(HaveOccurred(), "failed to create a deployment")
Expect(d).NotTo(BeNil(), "expected a deployement but none returned")
err = WaitForPodsReady(f.KubeClientSet, 5*time.Minute, int(replicas), f.IngressController.Namespace, metav1.ListOptions{
err = WaitForPodsReady(f.KubeClientSet, defaultTimeout, int(replicas), f.IngressController.Namespace, metav1.ListOptions{
LabelSelector: fields.SelectorFromSet(fields.Set(d.Spec.Template.ObjectMeta.Labels)).String(),
})
Expect(err).NotTo(HaveOccurred(), "failed to wait for to become ready")
Expect(err).NotTo(HaveOccurred(), "failed to wait for pods to become ready")
service := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
@ -104,7 +117,7 @@ func (f *Framework) NewDeployment(name, image string, port int32, replicas int32
Name: "http",
Port: 80,
TargetPort: intstr.FromInt(int(port)),
Protocol: "TCP",
Protocol: corev1.ProtocolTCP,
},
},
Selector: map[string]string{
@ -115,4 +128,7 @@ func (f *Framework) NewDeployment(name, image string, port int32, replicas int32
s := f.EnsureService(service)
Expect(s).NotTo(BeNil(), "expected a service but none returned")
err = WaitForEndpoints(f.KubeClientSet, defaultTimeout, name, f.IngressController.Namespace)
Expect(err).NotTo(HaveOccurred(), "failed to wait for endpoints to become ready")
}