Skip to content

Commit

Permalink
Merge pull request #13022 from pweil-/bz-1301464
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Feb 21, 2017
2 parents a16f4c6 + b0b9bbc commit 03e7153
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/diagnostics/cluster/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ func (d *ClusterRegistry) Check() types.DiagnosticResult {
if service := d.getRegistryService(r); service != nil {
// Check that it actually has pod(s) selected and running
if runningPods := d.getRegistryPods(service, r); len(runningPods) == 0 {
r.Error("DClu1001", nil, fmt.Sprintf(clRegNoRunningPods, registryName))
// not reporting an error here, if there are no running pods an error
// is reported by getRegistryPods
return r
} else if d.checkRegistryEndpoints(runningPods, r) { // Check that matching endpoint exists on the service
// attempt to create an imagestream and see if it gets the same registry service IP from the service cache
Expand Down

0 comments on commit 03e7153

Please sign in to comment.