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

fix(titus): Set default disruption budget based on job type #5250

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(titus): Set default disruption budget based on job type #5250

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
26 changes: 17 additions & 9 deletions ...ain/groovy/com/netflix/spinnaker/clouddriver/titus/deploy/actions/PrepareTitusDeploy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.netflix.spinnaker.clouddriver.titus.client.model.disruption.ContainerHealthProvider;
import com.netflix.spinnaker.clouddriver.titus.client.model.disruption.HourlyTimeWindow;
import com.netflix.spinnaker.clouddriver.titus.client.model.disruption.RatePercentagePerInterval;
import com.netflix.spinnaker.clouddriver.titus.client.model.disruption.SelfManaged;
import com.netflix.spinnaker.clouddriver.titus.client.model.disruption.TimeWindow;
import com.netflix.spinnaker.clouddriver.titus.deploy.actions.SubmitTitusJob.SubmitTitusJobCommand;
import com.netflix.spinnaker.clouddriver.titus.deploy.description.TitusDeployDescription;
Expand Down Expand Up @@ -219,7 +220,8 @@ private void configureDisruptionBudget(
// "systemDefault" should be treated as "no migrationPolicy"
if (description.getMigrationPolicy() == null
|| "systemDefault".equals(description.getMigrationPolicy().getType())) {
description.setDisruptionBudget(getDefaultDisruptionBudget(front50App));
description.setDisruptionBudget(
getDefaultDisruptionBudget(front50App, description.getJobType()));
}
}
}
Expand Down Expand Up @@ -367,17 +369,23 @@ private void setSpinnakerAccountEnvVar(TitusDeployDescription description) {
}

@Nonnull
private DisruptionBudget getDefaultDisruptionBudget(LoadFront50App.Front50App front50App) {
private DisruptionBudget getDefaultDisruptionBudget(
LoadFront50App.Front50App front50App, String jobType) {
DisruptionBudget budget = new DisruptionBudget();
budget.setAvailabilityPercentageLimit(new AvailabilityPercentageLimit(95));
budget.setRatePercentagePerInterval(new RatePercentagePerInterval(600_000, 5));
budget.setTimeWindows(Collections.singletonList(DEFAULT_SYSTEM_TIME_WINDOW));
if (JobType.BATCH.isEqual(jobType)) {
SelfManaged selfManaged = new SelfManaged();
selfManaged.setRelocationTimeMs(30000);
budget.setSelfManaged(selfManaged);
} else {
budget.setAvailabilityPercentageLimit(new AvailabilityPercentageLimit(95));
budget.setRatePercentagePerInterval(new RatePercentagePerInterval(600_000, 5));
budget.setTimeWindows(Collections.singletonList(DEFAULT_SYSTEM_TIME_WINDOW));

if (front50App != null && front50App.isPlatformHealthOnly()) {
budget.setContainerHealthProviders(
Collections.singletonList(new ContainerHealthProvider("eureka")));
if (front50App != null && front50App.isPlatformHealthOnly()) {
budget.setContainerHealthProviders(
Collections.singletonList(new ContainerHealthProvider("eureka")));
}
}

return budget;
}

Expand Down