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

Remove deployment updates from autodetect loop #869

Merged
merged 1 commit into from
Jan 31, 2020
Merged

Remove deployment updates from autodetect loop #869

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
60 changes: 0 additions & 60 deletions pkg/autodetect/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,64 +78,6 @@ func (b *Background) Stop() {
b.ticker.Stop()
}

func (b *Background) requireUpdates(deps *appsv1.DeploymentList) []*appsv1.Deployment {
instances := &v1.JaegerList{}
if err := b.clReader.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]
if inject.Needed(dep) { // If sidecar is not present and should be
jaeger := inject.Select(dep, instances)
if jaeger != nil { // Instance exists.
jaeger.Logger().WithFields(log.Fields{
"deploymentName": dep.Name,
"deploymentNamespace": dep.Namespace,
}).Info("Injecting Jaeger Agent sidecar")
dep.Annotations[inject.Annotation] = jaeger.Name
newDep := inject.Sidecar(jaeger, dep)
requireUpdates = append(requireUpdates, newDep)
}
} else {
// Try to update the sidecar if is required
jaeger := inject.Select(dep, instances)
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
}
}
}
}
return requireUpdates
}

func (b *Background) detectDeploymentUpdates() error {
deps := &appsv1.DeploymentList{}
if err := b.clReader.List(context.Background(), deps); err != nil {
return err
}
injectedDeps := b.requireUpdates(deps)
for _, d := range injectedDeps {
if err := b.cl.Update(context.Background(), d); err != nil {
return err
}
}

return nil
}

func (b *Background) autoDetectCapabilities() {
apiList, err := b.availableAPIs()
if err != nil {
Expand All @@ -151,8 +93,6 @@ func (b *Background) autoDetectCapabilities() {

b.detectClusterRoles()
b.cleanDeployments()
b.detectDeploymentUpdates()

}

func (b *Background) availableAPIs() (*metav1.APIGroupList, error) {
Expand Down
31 changes: 0 additions & 31 deletions pkg/autodetect/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,37 +495,6 @@ 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, cl)

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