return err if get manifestconfigoption failed (#310)

Signed-off-by: zhujian <[email protected]>

Author: zhujian7

pkg/addonmanager/controllers/agentdeploy/controller.go

@@ -406,7 +406,11 @@ func (c *addonDeployController) buildDeployManifestWorksFunc(addonWorkBuilder *a
 			mode, _ = agentAddon.GetAgentAddonOptions().HostedModeInfoFunc(addon, cluster)
 		}
 
-		manifestOptions := getManifestConfigOption(agentAddon, cluster, addon)
+		manifestOptions, err := getManifestConfigOption(agentAddon, cluster, addon)
+		if err != nil {
+			return nil, nil, fmt.Errorf("get manifest config option error: %v", err)
+		}
+
 		existingWorksCopy := []workapiv1.ManifestWork{}
 		for _, work := range existingWorks {
 			existingWorksCopy = append(existingWorksCopy, *work)

pkg/addonmanager/controllers/agentdeploy/util_test.go

@@ -507,7 +507,8 @@ func TestGetManifestConfigOption(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			manifestConfigOptions := getManifestConfigOption(c.agentAddon, nil, nil)
+			manifestConfigOptions, err := getManifestConfigOption(c.agentAddon, nil, nil)
+			assert.Nil(t, err)
 			assert.Equal(t, c.expectedManifestConfigOption, manifestConfigOptions)
 		})
 	}

pkg/addonmanager/controllers/agentdeploy/utils.go

@@ -471,7 +471,7 @@ func newAddonWorkObjectMeta(namePrefix, addonName, addonNamespace, workNamespace
 
 func getManifestConfigOption(agentAddon agent.AgentAddon,
 	cluster *clusterv1.ManagedCluster,
-	addon *addonapiv1alpha1.ManagedClusterAddOn) []workapiv1.ManifestConfigOption {
+	addon *addonapiv1alpha1.ManagedClusterAddOn) ([]workapiv1.ManifestConfigOption, error) {
 	manifestConfigs := []workapiv1.ManifestConfigOption{}
 
 	if agentAddon.GetAgentAddonOptions().HealthProber != nil &&
@@ -491,7 +491,7 @@ func getManifestConfigOption(agentAddon agent.AgentAddon,
 
 		manifests, err := agentAddon.Manifests(cluster, addon)
 		if err != nil {
-			return manifestConfigs
+			return manifestConfigs, fmt.Errorf("get all deployments error: %v", err)
 		}
 
 		deployments := utils.FilterDeployments(manifests)
@@ -506,7 +506,7 @@ func getManifestConfigOption(agentAddon agent.AgentAddon,
 
 		manifests, err := agentAddon.Manifests(cluster, addon)
 		if err != nil {
-			return manifestConfigs
+			return manifestConfigs, fmt.Errorf("get all workloads error: %v", err)
 		}
 		workloads := utils.FilterWorkloads(manifests)
 		for _, workload := range workloads {
@@ -543,7 +543,7 @@ func getManifestConfigOption(agentAddon agent.AgentAddon,
 			manifestConfigs[index].UpdateStrategy = mc.UpdateStrategy
 		}
 	}
-	return manifestConfigs
+	return manifestConfigs, nil
 }
 
 func containsResourceIdentifier(mcs []workapiv1.ManifestConfigOption, ri workapiv1.ResourceIdentifier) int {