Merge pull request #764 from taimir/bugfix-rs-daemonsets

Bugfix #762 - nullpointer dereference at RS / Deployments lists

Author: bryk

src/app/backend/resource/deployment/deploymentlist.go

@@ -71,7 +71,10 @@ func GetDeploymentListFromChannels(channels *common.ResourceChannels) (
 		if ok && statusErr.ErrStatus.Reason == "NotFound" {
 			// NotFound - this means that the server does not support Deployment objects, which
 			// is fine.
-			return nil, nil
+			emptyList := &DeploymentList{
+				Deployments: make([]Deployment, 0),
+			}
+			return emptyList, nil
 		}
 		return nil, err
 	}

src/app/backend/resource/replicaset/replicasetlist.go

@@ -71,7 +71,10 @@ func GetReplicaSetListFromChannels(channels *common.ResourceChannels) (
 		if ok && statusErr.ErrStatus.Reason == "NotFound" {
 			// NotFound - this means that the server does not support Replica Set objects, which
 			// is fine.
-			return nil, nil
+			emptyList := &ReplicaSetList{
+				ReplicaSets: make([]ReplicaSet, 0),
+			}
+			return emptyList, nil
 		}
 		return nil, err
 	}

src/test/backend/resource/deployment/deploymentlist_test.go

@@ -74,7 +74,9 @@ func TestGetDeploymentListFromChannels(t *testing.T) {
 			extensions.DeploymentList{},
 			&k8serrors.StatusError{ErrStatus: unversioned.Status{Reason: "NotFound"}},
 			&api.PodList{},
-			nil,
+			&DeploymentList{
+				Deployments: make([]Deployment, 0),
+			},
 			nil,
 		},
 		{

src/test/backend/resource/replicaset/replicasetlist_test.go

@@ -74,7 +74,9 @@ func TestGetReplicaSetListFromChannels(t *testing.T) {
 			extensions.ReplicaSetList{},
 			&k8serrors.StatusError{ErrStatus: unversioned.Status{Reason: "NotFound"}},
 			&api.PodList{},
-			nil,
+			&ReplicaSetList{
+				ReplicaSets: make([]ReplicaSet, 0),
+			},
 			nil,
 		},
 		{