Merge pull request #81 from qianjun1993/bug-fix

fix bug for map
tkestack · Oct 21, 2021 · b2799b5 · b2799b5
2 parents 99fb971 + 80595a1
commit b2799b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/tapp/controller.go b/pkg/tapp/controller.go
@@ -393,16 +393,17 @@ func (c *Controller) Sync(key string) error {
 	if err != nil {
 		return err
 	}
-	tapp, err := c.tappLister.TApps(namespace).Get(name)
+	curTapp, err := c.tappLister.TApps(namespace).Get(name)
 	if errors.IsNotFound(err) {
 		klog.Infof("TApp has been deleted %v", key)
 		return nil
 	}
 	if err != nil {
-		klog.Errorf("Unable to retrieve tapp %s from store: %v", util.GetTAppFullName(tapp), err)
+		klog.Errorf("Unable to retrieve tapp %s from store: %v", util.GetTAppFullName(curTapp), err)
 		return err
 	}
 
+	tapp := curTapp.DeepCopy()
 	err = c.preprocessTApp(tapp)
 	if err != nil {
 		klog.Errorf("Failed to preprocess tapp %s: %v", util.GetTAppFullName(tapp), err)

diff --git a/pkg/tapp/instance.go b/pkg/tapp/instance.go
@@ -442,7 +442,7 @@ func (p *ApiServerInstanceClient) Update(current *Instance, expected *Instance)
 
 	var err, e error
 	pod := current.pod
-	for i, cp := 0, current.pod; i <= updateRetries; i++ {
+	for i, cp := 0, current.pod.DeepCopy(); i <= updateRetries; i++ {
 		mergePod(cp, expected.pod)
 		klog.V(2).Infof("Updating pod %s, pod meta:%+v, pod spec:%+v", getPodFullName(cp), cp.ObjectMeta, cp.Spec)