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(deploy): Gracefully handle missing artifacts #918

Merged
merged 2 commits into from
Apr 19, 2018
Merged

fix(deploy): Gracefully handle missing artifacts #918

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
fee71dc
fix(deploy): Gracefully handle missing artifacts
ezimanyi Apr 18, 2018
1133f98
Move filtering of services upstream
ezimanyi Apr 19, 2018
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
6 changes: 5 additions & 1 deletion ...deploy/src/main/java/com/netflix/spinnaker/halyard/deploy/deployment/v1/BakeDeployer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.netflix.spinnaker.halyard.core.problem.v1.Problem;
import com.netflix.spinnaker.halyard.deploy.services.v1.GenerateService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.SpinnakerRuntimeSettings;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.ServiceSettings;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.SpinnakerService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.bake.BakeService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.bake.BakeServiceProvider;
Expand All @@ -43,7 +44,10 @@ public RemoteAction deploy(
List<SpinnakerService.Type> serviceTypes) {
List<BakeService> enabledServices = serviceProvider.getPrioritizedBakeableServices(serviceTypes)
.stream()
.filter(i -> resolvedConfiguration.getServiceSettings(i.getService()).getEnabled())
.filter(i -> {
ServiceSettings serviceSettings = resolvedConfiguration.getServiceSettings(i.getService());
return serviceSettings != null && serviceSettings.getEnabled();
})
.collect(Collectors.toList());

Map<String, String> installCommands = enabledServices.stream().reduce(new HashMap<>(), (commands, installable) -> {
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/netflix/spinnaker/halyard/deploy/deployment/v1/DistributedDeployer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public RemoteAction deploy(DistributedServiceProvider<T> serviceProvider,
.getPrioritizedDistributedServices(serviceTypes)) {
SpinnakerService service = distributedService.getService();
ServiceSettings settings = resolvedConfiguration.getServiceSettings(service);
if (!settings.getEnabled() || settings.getSkipLifeCycleManagement()) {
if (settings == null || !settings.getEnabled() || settings.getSkipLifeCycleManagement()) {
continue;
}

Expand Down
4 changes: 4 additions & 0 deletions ...loy/src/main/java/com/netflix/spinnaker/halyard/deploy/deployment/v1/KubectlDeployer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public RemoteAction deploy(KubectlServiceProvider serviceProvider,
List<KubernetesV2Service> services = serviceProvider.getServicesByPriority(serviceTypes);
services.stream().forEach((service) -> {
ServiceSettings settings = resolvedConfiguration.getServiceSettings((SpinnakerService) service);
if (settings == null) {
return;
}

if (settings.getEnabled() != null && !settings.getEnabled()) {
return;
}
Expand Down
7 changes: 6 additions & 1 deletion ...eploy/src/main/java/com/netflix/spinnaker/halyard/deploy/deployment/v1/LocalDeployer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.SpinnakerRuntimeSettings;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.ClouddriverService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.RedisService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.ServiceSettings;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.SpinnakerService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.local.LocalService;
import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.local.LocalServiceProvider;
Expand All @@ -46,7 +47,11 @@ public RemoteAction deploy(
List<SpinnakerService.Type> serviceTypes) {
List<LocalService> enabledServices = serviceProvider.getLocalServices(serviceTypes)
.stream()
.filter(i -> resolvedConfiguration.getServiceSettings(i.getService()).getEnabled())
.filter(i -> resolvedConfiguration.getServiceSettings(i.getService()) != null)
.filter(i -> {
ServiceSettings serviceSettings = resolvedConfiguration.getServiceSettings(i.getService());
return serviceSettings != null && serviceSettings.getEnabled();
})
.collect(Collectors.toList());

Map<String, String> installCommands = enabledServices.stream()
Expand Down
5 changes: 5 additions & 0 deletions ...main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/SpinnakerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ public ServiceSettings getDefaultServiceSettings(DeploymentConfiguration deploym
}
}

public boolean isInBillOfMaterials(DeploymentConfiguration deployment) {
String version = getArtifactService().getArtifactVersion(deployment.getName(), getArtifact());
return (version != null);
}

abstract public Type getType();
abstract public Class<T> getEndpointClass();
abstract public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints);
Expand Down
3 changes: 1 addition & 2 deletions ...a/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/SpinnakerServiceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ public SpinnakerRuntimeSettings buildRuntimeSettings(DeploymentConfiguration dep
SpinnakerRuntimeSettings endpoints = new SpinnakerRuntimeSettings();
for (SpinnakerService.Type type : SpinnakerService.Type.values()) {
SpinnakerService service = getSpinnakerService(type);
if (service != null) {
if (service != null && service.isInBillOfMaterials(deploymentConfiguration)) {
log.info("Building service settings entry for " + service.getServiceName());
ServiceSettings settings = service.getDefaultServiceSettings(deploymentConfiguration);
settings.mergePreferThis(service.buildServiceSettings(deploymentConfiguration));

endpoints.setServiceSettings(type, settings);
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...aker/halyard/deploy/spinnaker/v1/service/distributed/google/GoogleDistributedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,8 @@ default void ensureRunning(AccountDeploymentDetails<GoogleAccount> details,
boolean ready = false;
DaemonTaskHandler.message("Waiting for all instances to become healthy.");
while (!ready) {
ready = getRunningServiceDetails(details, runtimeSettings).getLatestEnabledVersion() == version;
Integer runningVersion = getRunningServiceDetails(details, runtimeSettings).getLatestEnabledVersion();
ready = version.equals(runningVersion);

DaemonTaskHandler.safeSleep(TimeUnit.SECONDS.toMillis(2));
}
Expand Down