Fix potential nil pointer dereference in reconcile loop

Fix potential for a panic due to nil pointer dereference if the workspace ServiceAccount does not exist. Signed-off-by: Angel Misevski <amisevsk@redhat.com>
devfile · Jun 30, 2023 · 559bb39 · 559bb39
1 parent b4fc4ea
commit 559bb39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go
@@ -443,8 +443,10 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return reconcileResult, reconcileErr
 	}
 
-	allPodAdditions = append(allPodAdditions, *pullSecretPodAdditions)
-	reconcileStatus.setConditionTrue(conditions.PullSecretsReady, "DevWorkspace secrets ready")
+	if pullSecretPodAdditions != nil && pullSecretPodAdditions.PullSecrets != nil {
+		allPodAdditions = append(allPodAdditions, *pullSecretPodAdditions)
+		reconcileStatus.setConditionTrue(conditions.PullSecretsReady, "DevWorkspace secrets ready")
+	}
 
 	if kubesync.HasKubelikeComponent(workspace) {
 		err := kubesync.HandleKubernetesComponents(workspace, clusterAPI)

diff --git a/pkg/provision/workspace/pull_secret.go b/pkg/provision/workspace/pull_secret.go
@@ -64,7 +64,7 @@ func PullSecrets(clusterAPI sync.ClusterAPI, serviceAccountName, namespace strin
 	if err != nil {
 		if k8sErrors.IsNotFound(err) {
 			// ServiceAccount does not exist, no pull secrets to extract
-			return nil, nil
+			return &v1alpha1.PodAdditions{}, nil
 		}
 		return nil, err
 	}