fix: No termination seconds in multi project (#1001) (#4207)

Signed-off-by: TheYoungManLi <[email protected]> Co-authored-by: cjl <[email protected]>
kubesphere · Oct 18, 2023 · 970fd81 · 970fd81
1 parent 4067c95
commit 970fd81
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/src/components/EditForms/Workload/TerminationSeconds/index.jsx b/src/components/EditForms/Workload/TerminationSeconds/index.jsx
@@ -23,7 +23,7 @@ import TerminationSecondsForm from 'components/Forms/Workload/ContainerSettings/
 
 class TerminationSeconds extends React.Component {
   render() {
-    const { formTemplate, formRef, formProps } = this.props
+    const { formTemplate, formRef, formProps, isFederated } = this.props
 
     return (
       <div className="margin-t12">
@@ -34,7 +34,7 @@ class TerminationSeconds extends React.Component {
             keepDataWhenUnCheck
             checkable
           >
-            <TerminationSecondsForm />
+            <TerminationSecondsForm isFederated={isFederated} />
           </Form.Group>
         </Form>
       </div>

diff --git a/src/components/Forms/Workload/ContainerSettings/TerminationSeconds/index.jsx b/src/components/Forms/Workload/ContainerSettings/TerminationSeconds/index.jsx
@@ -22,7 +22,12 @@ import { NumberInput } from 'components/Inputs'
 
 export default class TerminationSeconds extends React.Component {
   get prefix() {
-    return this.props.prefix || 'spec.template.'
+    const { isFederated, prefix } = this.props
+
+    return (
+      prefix ||
+      (isFederated ? 'spec.template.spec.template.' : 'spec.template.')
+    )
   }
 
   render() {

diff --git a/src/pages/fedprojects/components/ConfigTemplate/config.js b/src/pages/fedprojects/components/ConfigTemplate/config.js
@@ -22,6 +22,7 @@ import VolumeSettings from 'components/EditForms/Workload/VolumeSettings'
 import Affinity from 'components/EditForms/Workload/Affinity'
 import ServiceSetting from 'fedprojects/components/ServiceSetting'
 import ClusterDiffSettings from 'fedprojects/components/ClusterDiffSettings'
+import TerminationSeconds from 'components/EditForms/Workload/TerminationSeconds'
 
 export default {
   deployments: [
@@ -49,6 +50,12 @@ export default {
       title: 'POD_SCHEDULING_RULES',
       component: Affinity,
     },
+    {
+      icon: 'forbid-right-duotone',
+      name: 'podMode',
+      title: 'POD_GRACE_PERIOD',
+      component: TerminationSeconds,
+    },
     {
       title: 'CLUSTER_DIFF',
       icon: 'blue-green-deployment',
@@ -69,6 +76,12 @@ export default {
       title: 'CONTAINER_PL',
       component: PodTemplate,
     },
+    {
+      icon: 'forbid-right-duotone',
+      name: 'podMode',
+      title: 'POD_GRACE_PERIOD',
+      component: TerminationSeconds,
+    },
     {
       icon: 'storage',
       name: 'volumeSettings',

diff --git a/src/pages/projects/components/Modals/ConfigTemplate/config.js b/src/pages/projects/components/Modals/ConfigTemplate/config.js
@@ -75,6 +75,12 @@ export default {
       title: 'CONTAINER_PL',
       component: PodTemplate,
     },
+    {
+      icon: 'forbid-right-duotone',
+      name: 'podMode',
+      title: 'POD_GRACE_PERIOD',
+      component: TerminationSeconds,
+    },
     {
       icon: 'storage',
       name: 'volumeSettings',
@@ -101,5 +107,11 @@ export default {
       title: 'STORAGE',
       component: VolumeSettings,
     },
+    {
+      icon: 'forbid-right-duotone',
+      name: 'podMode',
+      title: 'POD_GRACE_PERIOD',
+      component: TerminationSeconds,
+    },
   ],
 }