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

Fixed nil pointer when no Jaeger is suitable for sidecar injection #783

Merged
merged 2 commits into from
Nov 22, 2019
Merged

Fixed nil pointer when no Jaeger is suitable for sidecar injection #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c2864
Fixed nil pointer when no Jaeger is suitable for sidecar injection
jpkrohling Nov 21, 2019
695f0ea
Skip to next item, instead of breaking the loop
jpkrohling Nov 21, 2019
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
12 changes: 11 additions & 1 deletion pkg/autodetect/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ func (b *Background) Stop() {
func (b *Background) requireUpdates(deps *appsv1.DeploymentList) []*appsv1.Deployment {
instances := &v1.JaegerList{}
if err := b.cl.List(context.Background(), instances); err != nil {
log.WithError(err).Info("failed to retrieve the list of Jaeger instances")
return nil
}

requireUpdates := make([]*appsv1.Deployment, 0)
for i := 0; i < len(deps.Items); i++ {
dep := &deps.Items[i]
Expand All @@ -99,7 +101,15 @@ func (b *Background) requireUpdates(deps *appsv1.DeploymentList) []*appsv1.Deplo
} else {
// Try to update the sidecar if is required
jaeger := inject.Select(dep, instances)
updated := inject.UpdateSideCar(jaeger, dep)
if jaeger == nil {
log.WithFields(log.Fields{
"deploymentName": dep.Name,
"deploymentNamespace": dep.Namespace,
}).Debug("no suitable jaeger for this instance, skipping injection")
continue
}

updated := inject.UpdateSidecar(jaeger, dep)
if updated {
if err := b.cl.Update(context.Background(), dep); err != nil {
return nil
Expand Down
31 changes: 31 additions & 0 deletions pkg/autodetect/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,37 @@ func TestCleanDeployments(t *testing.T) {
assert.Contains(t, persisted2.Labels, inject.Label)
}

func TestRequireUpdates(t *testing.T) {
s := scheme.Scheme
s.AddKnownTypes(v1.SchemeGroupVersion, &v1.JaegerList{})

dcl := &fakeDiscoveryClient{}
cl := customFakeClient()
b := WithClients(cl, dcl)

deps := &appsv1.DeploymentList{
Items: []appsv1.Deployment{{
Spec: appsv1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "my-business-container",
},
{
Name: "jaeger-agent", // manually added sidecar
},
},
},
},
},
}},
}

out := b.requireUpdates(deps)
assert.Len(t, out, 0)
}

type fakeClient struct {
client.Client
CreateFunc func(ctx context.Context, obj runtime.Object, opts ...client.CreateOption) error
Expand Down
4 changes: 2 additions & 2 deletions pkg/inject/sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ func Sidecar(jaeger *v1.Jaeger, dep *appsv1.Deployment) *appsv1.Deployment {
return dep
}

// UpdateSideCar modify the deployment side car with the latest parameters if it's required.
func UpdateSideCar(jaeger *v1.Jaeger, dep *appsv1.Deployment) bool {
// UpdateSidecar modify the deployment side car with the latest parameters if it's required.
func UpdateSidecar(jaeger *v1.Jaeger, dep *appsv1.Deployment) bool {
for i := range dep.Spec.Template.Spec.Containers {
if dep.Spec.Template.Spec.Containers[i].Name == "jaeger-agent" {
dep.Spec.Template.Spec.Containers[i] = container(jaeger, dep)
Expand Down