fix: Remove unuse code in container form.

kubesphere · May 26, 2020 · a474835 · a474835
1 parent 2663785
commit a474835
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/...Workload/ContainerSettings/ContainerForm/ContainerSetting/ImageSearch/DropdownContent.jsx b/...Workload/ContainerSettings/ContainerForm/ContainerSetting/ImageSearch/DropdownContent.jsx
@@ -51,7 +51,7 @@ export default class DropdownContent extends React.Component {
   }
 
   get registryUrl() {
-    const { formTemplate, imageRegistries } = this.props
+    const { imageRegistries } = this.props
     if (!isEmpty(imageRegistries) && this.secretValue) {
       const selectedSecret = imageRegistries.find(
         item => item.value === this.secretValue
@@ -64,11 +64,8 @@ export default class DropdownContent extends React.Component {
         return url
       }
     }
-    return get(
-      formTemplate,
-      'metadata.annotations["kubesphere.io/registryUrl"]',
-      ''
-    )
+
+    return ''
   }
 
   get imageName() {
@@ -130,12 +127,7 @@ export default class DropdownContent extends React.Component {
 
   handleSecretChange = value => {
     const { formTemplate } = this.props
-    const currentSecret = this.secretsOptions.find(item => item.value === value)
-    let url = currentSecret.url || 'docker.io'
-
-    url = url.endsWith('/') ? url : `${url}/`
     set(formTemplate, 'pullSecret', value)
-    set(formTemplate, 'metadata.annotations["kubesphere.io/registryUrl"]', url)
     this.props.onChange(this.registryUrl)
   }
 

diff --git a/src/components/Forms/Workload/ContainerSettings/ContainerForm/index.jsx b/src/components/Forms/Workload/ContainerSettings/ContainerForm/index.jsx
@@ -118,7 +118,7 @@ export default class ContaineForm extends React.Component {
   }
 
   handleSubmit = callback => {
-    const { onSave } = this.props
+    const { onSave, withService } = this.props
     const form = this.formRef.current
 
     form &&
@@ -143,6 +143,12 @@ export default class ContaineForm extends React.Component {
           )
         }
 
+        if (!withService) {
+          data.ports.forEach(item => {
+            delete item.servicePort
+          })
+        }
+
         onSave(data)
         callback && callback()
       })

diff --git a/src/components/Forms/Workload/ContainerSettings/index.jsx b/src/components/Forms/Workload/ContainerSettings/index.jsx
@@ -16,7 +16,7 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { concat, get, set, unset, isEmpty, omitBy, has, groupBy } from 'lodash'
+import { concat, get, set, unset, isEmpty, omitBy, has } from 'lodash'
 import React from 'react'
 import { safeParseJSON, generateId } from 'utils'
 import { MODULE_KIND_MAP } from 'utils/constants'
@@ -174,6 +174,7 @@ export default class ContainerSetting extends React.Component {
       if (container.pullSecret) {
         pullSecrets[container.pullSecret] = ''
         containerSecretMap[container.name] = container.pullSecret
+        delete container.pullSecret
       }
     })
 
@@ -191,7 +192,12 @@ export default class ContainerSetting extends React.Component {
   }
 
   updateService = formData => {
-    const { formTemplate, module } = this.props
+    const { formTemplate, module, withService } = this.props
+
+    if (!withService) {
+      return
+    }
+
     const containers = get(formData, `${this.prefix}spec.containers`, [])
 
     // auto gen service ports by workload container ports
@@ -265,34 +271,31 @@ export default class ContainerSetting extends React.Component {
     }
 
     // split mergedContainers and update formTemplate
-    const groupedContainers = groupBy(mergedContainers, 'type')
-    set(
-      this.formTemplate,
-      `${this.prefix}spec.containers`,
-      groupedContainers['worker']
-    )
-    set(
-      this.formTemplate,
-      `${this.prefix}spec.initContainers`,
-      groupedContainers['init'] || []
-    )
+    const _containers = []
+    const _initContainers = []
+    mergedContainers.forEach(item => {
+      if (item.type === 'worker') {
+        delete item.type
+        _containers.push(item)
+      } else {
+        delete item.type
+        _initContainers.push(item)
+      }
+    })
+    set(this.formTemplate, `${this.prefix}spec.containers`, _containers)
+    set(this.formTemplate, `${this.prefix}spec.initContainers`, _initContainers)
 
     // update image pull secrets
     this.updatePullSecrets(this.formTemplate)
 
-    if (this.props.withService) {
-      this.updateService(this.formTemplate)
-    }
+    this.updateService(this.formTemplate)
 
     this.hideContainer()
   }
 
   handleDelete = () => {
     this.updatePullSecrets(this.formTemplate)
-
-    if (this.props.withService) {
-      this.updateService(this.formTemplate)
-    }
+    this.updateService(this.formTemplate)
   }
 
   handleClusterChange = value => {