fix: Fix resourceVersion conflict when put resource

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 21, 2020 · b280ae1 · b280ae1
1 parent af2987e
commit b280ae1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/stores/base.js b/src/stores/base.js
@@ -16,7 +16,7 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { get } from 'lodash'
+import { get, set } from 'lodash'
 import { action, observable } from 'mobx'
 import ObjectMapper from 'utils/object.mapper'
 
@@ -203,7 +203,12 @@ export default class BaseStore {
   }
 
   @action
-  update(params, newObject) {
+  async update(params, newObject) {
+    const result = await require.get(this.getDetailUrl(params))
+    const resourceVersion = get(result, 'metadata.resourceVersion')
+    if (resourceVersion) {
+      set(newObject, 'metadata.resourceVersion', resourceVersion)
+    }
     return this.submitting(request.put(this.getDetailUrl(params), newObject))
   }
 

diff --git a/src/stores/service.js b/src/stores/service.js
@@ -157,17 +157,6 @@ export default class ServiceStore extends Base {
     return this.submitting(withDryRun(requests))
   }
 
-  @action
-  update({ name, cluster, namespace, resourceVersion }, newObject) {
-    if (!has(newObject, 'metadata.resourceVersion')) {
-      set(newObject, 'metadata.resourceVersion', resourceVersion)
-    }
-
-    return this.submitting(
-      request.put(this.getDetailUrl({ name, cluster, namespace }), newObject)
-    )
-  }
-
   @action
   async fetchWorkload({ cluster, namespace, ...params }) {
     const workloadTypes = ['deployments', 'statefulsets']