fix: Remove network isolation setting in project create

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 20, 2020 · e3d0898 · e3d0898
1 parent 07325e0
commit e3d0898
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 31 deletions.
diff --git a/server/config.yaml b/server/config.yaml
@@ -458,9 +458,6 @@ client:
   # show kubeconfig
   enableKubeConfig: true
 
-  # show kubeconfig
-  defaultNetworkIsolation: false
-
   # third party tools
   thirdPartyTools:
     []

diff --git a/src/components/Modals/FedProjectCreate/index.jsx b/src/components/Modals/FedProjectCreate/index.jsx
@@ -242,20 +242,6 @@ export default class FedProjectCreateModal extends React.Component {
             </Column>
           </Columns>
           <Columns>
-            <Column>
-              <Form.Item
-                label={t('Network Isolation')}
-                desc={t('NETWORK_ISOLATED_DESC')}
-              >
-                <Select
-                  name="metadata.annotations['kubesphere.io/network-isolate']"
-                  options={this.networkOptions}
-                  defaultValue={
-                    globals.config.defaultNetworkIsolation ? 'enabled' : ''
-                  }
-                />
-              </Form.Item>
-            </Column>
             <Column>
               <Form.Item label={t('Description')} desc={t('DESCRIPTION_DESC')}>
                 <TextArea
@@ -264,6 +250,7 @@ export default class FedProjectCreateModal extends React.Component {
                 />
               </Form.Item>
             </Column>
+            <Column />
           </Columns>
           {this.renderClusters()}
         </div>

diff --git a/src/components/Modals/ProjectCreate/index.jsx b/src/components/Modals/ProjectCreate/index.jsx
@@ -238,20 +238,6 @@ export default class ProjectCreateModal extends React.Component {
             </Column>
           </Columns>
           <Columns>
-            <Column>
-              <Form.Item
-                label={t('Network Isolation')}
-                desc={t('NETWORK_ISOLATED_DESC')}
-              >
-                <Select
-                  name="metadata.annotations['kubesphere.io/network-isolate']"
-                  options={this.networkOptions}
-                  defaultValue={
-                    globals.config.defaultNetworkIsolation ? 'enabled' : ''
-                  }
-                />
-              </Form.Item>
-            </Column>
             <Column>
               <Form.Item label={t('Description')} desc={t('DESCRIPTION_DESC')}>
                 <TextArea
@@ -260,6 +246,7 @@ export default class ProjectCreateModal extends React.Component {
                 />
               </Form.Item>
             </Column>
+            <Column />
           </Columns>
           {!hideCluster && this.renderClusters()}
         </div>