Feat: report the manifest name when addon enabling failed (#4545)

* Feat: Report the manifest name when Addon enabling failed

Signed-off-by: ghostloda <78798447@qq.com>

* Apply suggestions from code review

Co-authored-by: Jianbo Sun <wonderflow@icloud.com>
Signed-off-by: ghostloda <78798447@qq.com>

* Apply suggestions from code review

Co-authored-by: Charlie Chiang <charlie_c_0129@outlook.com>
Signed-off-by: ghostloda <78798447@qq.com>

Co-authored-by: Jianbo Sun <wonderflow@icloud.com>
Co-authored-by: Charlie Chiang <charlie_c_0129@outlook.com>
This commit is contained in:
ghostloda
2022-08-03 13:51:20 +08:00
committed by GitHub
co-authored by Jianbo Sun Charlie Chiang
parent 7964ec90e4
commit ccb122d4a7
3 changed files with 7 additions and 7 deletions
+5 -5
View File
@@ -683,7 +683,7 @@ func RenderDefinitions(addon *InstallPackage, config *rest.Config) ([]*unstructu
for _, def := range addon.Definitions {
obj, err := renderObject(def)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "render definition file %s", def.Name)
}
// we should ignore the namespace defined in definition yaml, override the filed by DefaultKubeVelaNS
obj.SetNamespace(types.DefaultKubeVelaNS)
@@ -712,7 +712,7 @@ func RenderDefinitionSchema(addon *InstallPackage) ([]*unstructured.Unstructured
for _, teml := range addon.DefSchemas {
u, err := renderSchemaConfigmap(teml)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "render uiSchema file %s", teml.Name)
}
schemaConfigmaps = append(schemaConfigmaps, u)
}
@@ -725,14 +725,14 @@ func RenderViews(addon *InstallPackage) ([]*unstructured.Unstructured, error) {
for _, view := range addon.YAMLViews {
obj, err := renderObject(view)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "render velaQL view file %s", view.Name)
}
views = append(views, obj)
}
for _, view := range addon.CUEViews {
obj, err := renderCUEView(view)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "render velaQL view file %s", view.Name)
}
views = append(views, obj)
}
@@ -796,7 +796,7 @@ func renderK8sObjectsComponent(elems []ElementFile, addonName string) (*common2.
for _, elem := range elems {
obj, err := renderObject(elem)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "render resource file %s", elem.Name)
}
objects = append(objects, obj)
}
+1 -1
View File
@@ -328,7 +328,7 @@ func renderResources(addon *InstallPackage, args map[string]interface{}) ([]comm
if len(addon.YAMLTemplates) != 0 {
comp, err := renderK8sObjectsComponent(addon.YAMLTemplates, addon.Name)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "render components from yaml template")
}
resources = append(resources, *comp)
}
+1 -1
View File
@@ -461,7 +461,7 @@ func checkConflictDefs(ctx context.Context, k8sClient client.Client, defs []*uns
}
}
if err != nil && !errors2.IsNotFound(err) {
return nil, err
return nil, errors.Wrapf(err, "check definition %s", def.GetName())
}
}
return res, nil