Skip to content

Commit

Permalink
Remove deployment updates from autodetect loop
Browse files Browse the repository at this point in the history
Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
  • Loading branch information
rubenvp8510 committed Jan 20, 2020
1 parent b4a35c4 commit 5f62402
Showing 1 changed file with 0 additions and 60 deletions.
60 changes: 0 additions & 60 deletions pkg/autodetect/main.go
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

0 comments on commit 5f62402

Please sign in to comment.