Skip to content

Commit

Permalink
fix(provider/kubernetes): tolerate per namespace failures (#2435)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielpeach committed Mar 20, 2018
1 parent c1999cf commit 9be993c
Showing 1 changed file with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.op.job.KubectlJobExecutor;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.op.job.KubectlJobExecutor.KubectlException;
import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -65,7 +66,15 @@ protected boolean hasClusterRelationship() {

protected List<KubernetesManifest> loadPrimaryResourceList() {
return namespaces.stream()
.map(n -> credentials.list(primaryKind(), n))
.map(n -> {
try {
return credentials.list(primaryKind(), n);
} catch (KubectlException e) {
log.warn("Failed to read kind {} from namespace {}: {}", primaryKind(), n, e.getMessage());
return null;
}
})
.filter(Objects::nonNull)
.flatMap(Collection::stream)
.collect(Collectors.toList());
}
Expand Down

0 comments on commit 9be993c

Please sign in to comment.