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

Create daemonsets after services and deployments. #1176

Merged
merged 2 commits into from
Sep 7, 2020
Merged

Create daemonsets after services and deployments. #1176

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a076e4f
Create daemonsets after services and deployments.
jpkrohling Sep 1, 2020
2f906d5
s/changes/chances
jpkrohling Sep 1, 2020
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
10 changes: 6 additions & 4 deletions pkg/controller/jaeger/jaeger_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,6 @@ func (r *ReconcileJaeger) apply(ctx context.Context, jaeger v1.Jaeger, str strat
return jaeger, tracing.HandleError(err, span)
}

if err := r.applyDaemonSets(ctx, jaeger, str.DaemonSets()); err != nil {
return jaeger, tracing.HandleError(err, span)
}

// seems counter intuitive to have services created *before* deployments,
// but some resources used by deployments are created by services, such as TLS certs
// for the oauth proxy, if one is used
Expand Down Expand Up @@ -358,5 +354,11 @@ func (r *ReconcileJaeger) apply(ctx context.Context, jaeger v1.Jaeger, str strat
return jaeger, nil
}

// we apply the daemonsets after everything else, to increase the changes of having services and deployments
// ready by the time the daemonset is started, so that it gets at least one collector to connect to
if err := r.applyDaemonSets(ctx, jaeger, str.DaemonSets()); err != nil {
return jaeger, tracing.HandleError(err, span)
}

return jaeger, nil
}