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.

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

Remove zipkin service #75

Merged
merged 1 commit into from
Oct 30, 2018
Merged
Changes from all commits
Commits
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
Remove zipkin service
Signed-off-by: Gary Brown <[email protected]>
objectiser committed Oct 23, 2018
commit 2b6cfeee5f02c982d5b27e33e97b96522b114c5d
5 changes: 2 additions & 3 deletions pkg/controller/all-in-one_test.go
Original file line number Diff line number Diff line change
@@ -50,9 +50,9 @@ func TestDelegateAllInOneDepedencies(t *testing.T) {

func assertDeploymentsAndServicesForAllInOne(t *testing.T, name string, objs []sdk.Object, hasDaemonSet bool) {
if hasDaemonSet {
assert.Len(t, objs, 7)
} else {
assert.Len(t, objs, 6)
} else {
assert.Len(t, objs, 5)
}

// we should have one deployment, named after the Jaeger's name (ObjectMeta.Name)
@@ -69,7 +69,6 @@ func assertDeploymentsAndServicesForAllInOne(t *testing.T, name string, objs []s
fmt.Sprintf("%s-agent", name): false,
fmt.Sprintf("%s-collector", name): false,
fmt.Sprintf("%s-query", name): false,
fmt.Sprintf("%s-zipkin", name): false,
}

// and the ingress rule
2 changes: 1 addition & 1 deletion pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ func TestNewControllerForProduction(t *testing.T) {

ctrl := NewController(context.TODO(), jaeger)
ds := ctrl.Create()
assert.Len(t, ds, 6)
assert.Len(t, ds, 5)
}

func TestUnknownStorage(t *testing.T) {
5 changes: 2 additions & 3 deletions pkg/controller/production_test.go
Original file line number Diff line number Diff line change
@@ -86,9 +86,9 @@ func TestDelegateProductionDepedencies(t *testing.T) {

func assertDeploymentsAndServicesForProduction(t *testing.T, name string, objs []sdk.Object, hasDaemonSet bool) {
if hasDaemonSet {
assert.Len(t, objs, 7)
} else {
assert.Len(t, objs, 6)
} else {
assert.Len(t, objs, 5)
}

deployments := map[string]bool{
@@ -103,7 +103,6 @@ func assertDeploymentsAndServicesForProduction(t *testing.T, name string, objs [
services := map[string]bool{
fmt.Sprintf("%s-collector", name): false,
fmt.Sprintf("%s-query", name): false,
fmt.Sprintf("%s-zipkin", name): false,
}

ingresses := map[string]bool{
1 change: 0 additions & 1 deletion pkg/deployment/all-in-one.go
Original file line number Diff line number Diff line change
@@ -143,7 +143,6 @@ func (a *AllInOne) Services() []*v1.Service {
service.NewCollectorService(a.jaeger, selector),
service.NewQueryService(a.jaeger, selector),
service.NewAgentService(a.jaeger, selector),
service.NewZipkinService(a.jaeger, selector),
}
}

2 changes: 1 addition & 1 deletion pkg/deployment/all-in-one_test.go
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ func TestAllInOneHasOwner(t *testing.T) {
func TestAllInOneNumberOfServices(t *testing.T) {
name := "TestNumberOfServices"
services := NewAllInOne(v1alpha1.NewJaeger(name)).Services()
assert.Len(t, services, 4) // collector, query, agent,zipkin
assert.Len(t, services, 3) // collector, query, agent

for _, svc := range services {
owners := svc.ObjectMeta.OwnerReferences
1 change: 0 additions & 1 deletion pkg/deployment/collector.go
Original file line number Diff line number Diff line change
@@ -123,7 +123,6 @@ func (c *Collector) Services() []*v1.Service {
selector := c.selector()
return []*v1.Service{
service.NewCollectorService(c.jaeger, selector),
service.NewZipkinService(c.jaeger, selector),
}
}

2 changes: 1 addition & 1 deletion pkg/deployment/collector_test.go
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ func TestName(t *testing.T) {
func TestCollectorServices(t *testing.T) {
collector := NewCollector(v1alpha1.NewJaeger("TestName"))
svcs := collector.Services()
assert.Len(t, svcs, 2)
assert.Len(t, svcs, 1)
}

func TestDefaultCollectorImage(t *testing.T) {
46 changes: 0 additions & 46 deletions pkg/service/zipkin.go

This file was deleted.

22 changes: 0 additions & 22 deletions pkg/service/zipkin_test.go

This file was deleted.