Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use proper jaeger-operator version for e2e tests and remove readiness check from DaemonSet #120

Merged
merged 1 commit into from
Nov 21, 2018
Merged

Use proper jaeger-operator version for e2e tests and remove readiness check from DaemonSet #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,18 @@ unit-tests:
.PHONY: e2e-tests
e2e-tests: cassandra es crd build docker push
@echo Running end-to-end tests...
@operator-sdk test local ./test/e2e --go-test-flags="${GO_TEST_FLAGS}"

@cp deploy/role_binding.yaml deploy/test/namespace-manifests.yaml
@echo "---" >> deploy/test/namespace-manifests.yaml

@cat deploy/role.yaml >> deploy/test/namespace-manifests.yaml
@echo "---" >> deploy/test/namespace-manifests.yaml

@cat deploy/service_account.yaml >> deploy/test/namespace-manifests.yaml
@echo "---" >> deploy/test/namespace-manifests.yaml

@cat deploy/operator.yaml | sed "s~image: jaegertracing\/jaeger-operator\:.*~image: $(BUILD_IMAGE)~gi" >> deploy/test/namespace-manifests.yaml
@go test ./test/e2e/... -kubeconfig $(KUBERNETES_CONFIG) -namespacedMan ../../deploy/test/namespace-manifests.yaml -globalMan ../../deploy/crds/io_v1alpha1_jaeger_crd.yaml -root .

.PHONY: run
run: crd
Expand Down
20 changes: 10 additions & 10 deletions pkg/deployment/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/jaegertracing/jaeger-operator/pkg/apis/io/v1alpha1"
"github.com/jaegertracing/jaeger-operator/pkg/service"
Expand Down Expand Up @@ -111,15 +110,16 @@ func (a *Agent) Get() *appsv1.DaemonSet {
Protocol: v1.ProtocolUDP,
},
},
ReadinessProbe: &v1.Probe{
Handler: v1.Handler{
HTTPGet: &v1.HTTPGetAction{
Path: "/metrics",
Port: intstr.FromInt(5778),
},
},
InitialDelaySeconds: 1,
},
// TODO(jpkroehling): enable it back once a version with jaegertracing/jaeger#1178 is released
// ReadinessProbe: &v1.Probe{
// Handler: v1.Handler{
// HTTPGet: &v1.HTTPGetAction{
// Path: "/metrics",
// Port: intstr.FromInt(5778),
// },
// },
// InitialDelaySeconds: 1,
// },
Resources: commonSpec.Resources,
}},
},
Expand Down