Merge pull request #129 from layer5io/bug/install

fixes for namespace deployment
meshery · Oct 12, 2020 · 3ea5e3f · 3ea5e3f
2 parents b7084c0 + 2b2f593
commit 3ea5e3f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/linkerd/linkerd.go b/linkerd/linkerd.go
@@ -633,6 +633,9 @@ func (iClient *Client) applyConfigChange(ctx context.Context, deploymentYAML, na
 			data := &unstructured.Unstructured{}
 			data.SetUnstructuredContent(unstructuredObj)
 			logrus.Debug(unstructuredObj)
+			if len(data.GetNamespace()) > 2 {
+				namespace = data.GetNamespace()
+			}
 
 			if mapping.Scope.Name() == "root" {
 				if deleteOpts {
@@ -669,7 +672,8 @@ func (iClient *Client) applyConfigChange(ctx context.Context, deploymentYAML, na
 					}
 					err = iClient.k8sDynamicClient.Resource(mapping.Resource).Namespace(namespace).Delete(data.GetName(), deleteOptions)
 					if err != nil && !kubeerror.IsNotFound(err) {
-						logrus.Error(fmt.Sprintf("Delete the %s %s in namespace %s failed", data.GetObjectKind().GroupVersionKind().Kind, data.GetName(), namespace))
+						errors.Wrapf(err, fmt.Sprintf("Delete the %s %s in namespace %s failed", data.GetObjectKind().GroupVersionKind().Kind, data.GetName(), namespace))
+						logrus.Error(err)
 						return err
 					}
 
@@ -678,7 +682,8 @@ func (iClient *Client) applyConfigChange(ctx context.Context, deploymentYAML, na
 				} else {
 					_, err = iClient.k8sDynamicClient.Resource(mapping.Resource).Namespace(namespace).Create(data, metav1.CreateOptions{})
 					if err != nil && !kubeerror.IsAlreadyExists(err) {
-						logrus.Error(fmt.Sprintf("Create the %s %s in namespace %s failed", data.GetObjectKind().GroupVersionKind().Kind, data.GetName(), namespace))
+						err = errors.Wrapf(err, fmt.Sprintf("Create the %s %s in namespace %s failed", data.GetObjectKind().GroupVersionKind().Kind, data.GetName(), namespace))
+						logrus.Error(err)
 						return err
 					}
 					logrus.Info(fmt.Sprintf("Create the %s %s in namespace %s succeed", data.GetObjectKind().GroupVersionKind().Kind, data.GetName(), namespace))