@@ -152,7 +152,7 @@ class AppShareAppInfo extends PureComponent {
})}
style={pd16}
>
- {getFieldDecorator(`${ID}||min_node`, {
+ {getFieldDecorator(`extend||min_node||${ID}`, {
initialValue: app.extend_method_map.min_node,
rules: [
{
@@ -181,7 +181,7 @@ class AppShareAppInfo extends PureComponent {
})}
style={pd16}
>
- {getFieldDecorator(`${ID}||max_node`, {
+ {getFieldDecorator(`extend||max_node||${ID}`, {
initialValue: app.extend_method_map.max_node,
rules: [
{
@@ -210,7 +210,7 @@ class AppShareAppInfo extends PureComponent {
})}
style={pd16}
>
- {getFieldDecorator(`${ID}||step_node`, {
+ {getFieldDecorator(`extend||step_node||${ID}`, {
initialValue: app.extend_method_map.step_node,
rules: [
{
@@ -239,7 +239,7 @@ class AppShareAppInfo extends PureComponent {
})}
style={pd16}
>
- {getFieldDecorator(`${ID}||init_memory`, {
+ {getFieldDecorator(`extend||init_memory||${ID}`, {
initialValue: app.extend_method_map.init_memory || 0,
rules: [
{
@@ -272,7 +272,7 @@ class AppShareAppInfo extends PureComponent {
})}
style={pd16}
>
- {getFieldDecorator(`${ID}||container_cpu`, {
+ {getFieldDecorator(`extend||container_cpu||${ID}`, {
initialValue: app.extend_method_map.container_cpu || 0,
rules: [
{
diff --git a/src/pages/Group/components/appShareFormHelpers.js b/src/pages/Group/components/appShareFormHelpers.js
new file mode 100644
index 000000000..d247aa0c9
--- /dev/null
+++ b/src/pages/Group/components/appShareFormHelpers.js
@@ -0,0 +1,108 @@
+const cloneShareService = item => ({
+ ...item,
+ extend_method_map: item.extend_method_map
+ ? { ...item.extend_method_map }
+ : item.extend_method_map,
+ dep_service_map_list: Array.isArray(item.dep_service_map_list)
+ ? item.dep_service_map_list.map(dep => ({ ...dep }))
+ : [],
+ service_connect_info_map_list: Array.isArray(item.service_connect_info_map_list)
+ ? item.service_connect_info_map_list.map(config => ({ ...config }))
+ : [],
+ service_env_map_list: Array.isArray(item.service_env_map_list)
+ ? item.service_env_map_list.map(config => ({ ...config }))
+ : []
+});
+
+const collectShareServiceData = ({
+ shareServiceList = [],
+ selectedShareKeys = [],
+ componentRefs = []
+}) => {
+ const shareServiceData = shareServiceList.map(cloneShareService);
+ let componentFormHasError = false;
+
+ componentRefs.forEach(app => {
+ if (!app || !app.props || !app.props.form) {
+ return;
+ }
+ const apptab = app.props.tab;
+ let componentValues = null;
+ app.props.form.validateFields((errs, val) => {
+ if (errs) {
+ componentFormHasError = true;
+ return;
+ }
+ componentValues = val;
+ });
+ if (componentFormHasError || !componentValues) {
+ return;
+ }
+ shareServiceData.forEach(option => {
+ const ID = option.service_id;
+ if (option.service_alias !== apptab) {
+ return;
+ }
+ Object.keys(componentValues).forEach(index => {
+ const indexarr = index.split('||');
+ const firstInfo = indexarr && indexarr.length > 0 && indexarr[0];
+ if (!firstInfo) {
+ return;
+ }
+ const isConnect = firstInfo === 'connect';
+ const isEnv = firstInfo === 'env';
+
+ if (isConnect && indexarr[2] !== 'random') {
+ option.service_connect_info_map_list.forEach(serapp => {
+ if (
+ serapp.attr_name === indexarr[1] &&
+ String(ID) === String(indexarr[3])
+ ) {
+ serapp[indexarr[2]] = componentValues[index];
+ serapp.is_change = true;
+ }
+ });
+ }
+
+ if (isEnv) {
+ option.service_env_map_list.forEach(serapp => {
+ if (
+ serapp.attr_name === indexarr[1] &&
+ String(ID) === String(indexarr[2])
+ ) {
+ serapp.attr_value = componentValues[index];
+ serapp.is_change = true;
+ }
+ });
+ }
+
+ if (
+ firstInfo === 'extend' &&
+ option.extend_method_map &&
+ String(ID) === String(indexarr[2])
+ ) {
+ option.extend_method_map[indexarr[1]] = componentValues[index];
+ }
+ });
+ });
+ });
+
+ const selectedShareServices = [];
+ selectedShareKeys.forEach(shareKey => {
+ shareServiceData.forEach(option => {
+ if (shareKey === option.service_share_uuid) {
+ selectedShareServices.push(option);
+ }
+ });
+ });
+
+ return {
+ componentFormHasError,
+ shareServiceData,
+ selectedShareServices
+ };
+};
+
+module.exports = {
+ collectShareServiceData
+};
diff --git a/src/pages/Group/components/appShareFormHelpers.node.test.js b/src/pages/Group/components/appShareFormHelpers.node.test.js
new file mode 100644
index 000000000..445dc165c
--- /dev/null
+++ b/src/pages/Group/components/appShareFormHelpers.node.test.js
@@ -0,0 +1,47 @@
+const assert = require('assert');
+const { collectShareServiceData } = require('./appShareFormHelpers');
+
+const componentRef = {
+ props: {
+ tab: 'web',
+ form: {
+ validateFields(callback) {
+ callback(null, {
+ 'extend||min_node||service-1': 2,
+ 'extend||max_node||service-1': 5,
+ 'extend||step_node||service-1': 2,
+ 'extend||init_memory||service-1': 1024,
+ 'extend||container_cpu||service-1': 500
+ });
+ }
+ }
+ }
+};
+
+const result = collectShareServiceData({
+ shareServiceList: [
+ {
+ service_id: 'service-1',
+ service_alias: 'web',
+ service_share_uuid: 'service-1+service-1',
+ extend_method_map: {
+ min_node: 1,
+ max_node: 3,
+ step_node: 1,
+ init_memory: 512,
+ container_cpu: 250
+ }
+ }
+ ],
+ selectedShareKeys: ['service-1+service-1'],
+ componentRefs: [componentRef]
+});
+
+assert.strictEqual(result.componentFormHasError, false);
+assert.deepStrictEqual(result.selectedShareServices[0].extend_method_map, {
+ min_node: 2,
+ max_node: 5,
+ step_node: 2,
+ init_memory: 1024,
+ container_cpu: 500
+});
diff --git a/src/pages/Group/components/appShareHelpers.js b/src/pages/Group/components/appShareHelpers.js
index f9cfbaa34..5f24f3dc4 100644
--- a/src/pages/Group/components/appShareHelpers.js
+++ b/src/pages/Group/components/appShareHelpers.js
@@ -5,8 +5,13 @@ const {
DEFAULT_SNAPSHOT_VERSION,
buildNextSnapshotVersion
} = snapshotVersionHelpers;
+const { collectShareServiceData } = require('./appShareFormHelpers');
-export { DEFAULT_SNAPSHOT_VERSION, buildNextSnapshotVersion };
+export {
+ DEFAULT_SNAPSHOT_VERSION,
+ buildNextSnapshotVersion,
+ collectShareServiceData
+};
export const appShareStateSelector = ({
user,
@@ -33,104 +38,3 @@ export const validateShareVersion = value => {
}
return null;
};
-
-const cloneShareService = item => ({
- ...item,
- extend_method_map: item.extend_method_map
- ? { ...item.extend_method_map }
- : item.extend_method_map,
- dep_service_map_list: Array.isArray(item.dep_service_map_list)
- ? item.dep_service_map_list.map(dep => ({ ...dep }))
- : [],
- service_connect_info_map_list: Array.isArray(item.service_connect_info_map_list)
- ? item.service_connect_info_map_list.map(config => ({ ...config }))
- : [],
- service_env_map_list: Array.isArray(item.service_env_map_list)
- ? item.service_env_map_list.map(config => ({ ...config }))
- : []
-});
-
-export const collectShareServiceData = ({
- shareServiceList = [],
- selectedShareKeys = [],
- componentRefs = []
-}) => {
- const shareServiceData = shareServiceList.map(cloneShareService);
- let componentFormHasError = false;
-
- componentRefs.forEach(app => {
- if (!app || !app.props || !app.props.form) {
- return;
- }
- const apptab = app.props.tab;
- let componentValues = null;
- app.props.form.validateFields((errs, val) => {
- if (errs) {
- componentFormHasError = true;
- return;
- }
- componentValues = val;
- });
- if (componentFormHasError || !componentValues) {
- return;
- }
- shareServiceData.forEach(option => {
- const ID = option.service_id;
- if (option.service_alias !== apptab) {
- return;
- }
- Object.keys(componentValues).forEach(index => {
- const indexarr = index.split('||');
- const firstInfo = indexarr && indexarr.length > 0 && indexarr[0];
- if (!firstInfo) {
- return;
- }
- const isConnect = firstInfo === 'connect';
- const isEnv = firstInfo === 'env';
-
- if (isConnect && indexarr[2] !== 'random') {
- option.service_connect_info_map_list.forEach(serapp => {
- if (
- serapp.attr_name === indexarr[1] &&
- String(ID) === String(indexarr[3])
- ) {
- serapp[indexarr[2]] = componentValues[index];
- serapp.is_change = true;
- }
- });
- }
-
- if (isEnv) {
- option.service_env_map_list.forEach(serapp => {
- if (
- serapp.attr_name === indexarr[1] &&
- String(ID) === String(indexarr[2])
- ) {
- serapp.attr_value = componentValues[index];
- serapp.is_change = true;
- }
- });
- }
-
- if (firstInfo === 'extend' && option.extend_method_map) {
- option.extend_method_map[indexarr[1]] = componentValues[index];
- }
- });
- });
- });
-
- const selectedShareServices = [];
- selectedShareKeys.forEach(shareKey => {
- shareServiceData.forEach(option => {
- if (shareKey === option.service_share_uuid) {
- selectedShareServices.push(option);
- }
- });
- });
-
- return {
- componentFormHasError,
- shareServiceData,
- selectedShareServices
- };
-};
diff --git a/src/pages/ResourceCenter/components/HelmModals.js b/src/pages/ResourceCenter/components/HelmModals.js
index 1f4770699..d2dcf4fad 100644
--- a/src/pages/ResourceCenter/components/HelmModals.js
+++ b/src/pages/ResourceCenter/components/HelmModals.js
@@ -69,6 +69,18 @@ class HelmModals extends PureComponent {
);
}
+ renderHelmNativeResourceNotice() {
+ const helmModalMode = this.getStateValue('helmModalMode', 'install');
+ if (helmModalMode !== 'install') {
+ return null;
+ }
+ return (
+
+ {t('resourceCenter.helm.modal.nativeResourceNotice', '这里安装的是 Helm Release，会作为 Kubernetes 原生资源在「K8S 原生资源」中查看和管理，不会自动出现在「应用管理」。如需应用管理中的应用或组件，请从应用管理入口创建。')}
+
+ );
+ }
+
renderHelmBrowse() {
const helmRepos = this.getStateValue('helmRepos', []);
const helmRepoLoading = this.getStateValue('helmRepoLoading', false);
@@ -785,6 +797,7 @@ class HelmModals extends PureComponent {
bodyStyle={{ padding: '16px 24px', minHeight: 560 }}
>
{this.renderHelmUpgradeAssistant()}
+ {this.renderHelmNativeResourceNotice()}
{helmStep === 'source' && this.renderHelmSourceTabs()}
{this.renderHelmStepContent()}
diff --git a/src/pages/ResourceCenter/index.js b/src/pages/ResourceCenter/index.js
index 69f5f5f87..6a714cd2f 100644
--- a/src/pages/ResourceCenter/index.js
+++ b/src/pages/ResourceCenter/index.js
@@ -45,7 +45,7 @@ import HelmTab from './tabs/HelmTab';
currentEnterprise: enterprise.currentEnterprise,
rainbondInfo: global.rainbondInfo,
currentUser: user.currentUser,
- resourceListLoading: loading.effects['teamResources/fetchResources'],
+ resourceListLoading: loading.effects['teamResources/fetchResources'] || loading.effects['teamResources/fetchNetworkResources'],
configListLoading: loading.effects['teamResources/fetchConfigResources'],
helmListLoading: loading.effects['teamResources/fetchHelmReleases'],
resourceYamlLoading: loading.effects['teamResources/fetchResource'],
@@ -389,6 +389,13 @@ class ResourceCenter extends PureComponent {
});
return;
}
+ if (tab === 'network') {
+ dispatch({
+ type: 'teamResources/fetchNetworkResources',
+ payload: { team: teamName, region: regionName },
+ });
+ return;
+ }
const resourceParams = tab === 'workload'
? { group: extra.group || workloadKindGroup || 'apps', version: 'v1', resource: extra.resource || workloadKind || 'deployments' }
: TAB_RESOURCE_MAP[tab] || TAB_RESOURCE_MAP.workload;
@@ -427,6 +434,13 @@ class ResourceCenter extends PureComponent {
const kind = ((record && record.kind) || '').toLowerCase();
return { group: '', version: 'v1', resource: kind === 'secret' ? 'secrets' : 'configmaps' };
}
+ if (tab === 'network') {
+ const kind = ((record && record.kind) || '').toLowerCase();
+ if (kind === 'ingress') {
+ return { group: 'networking.k8s.io', version: 'v1', resource: 'ingresses' };
+ }
+ return { group: '', version: 'v1', resource: 'services' };
+ }
return this.getCurrentResourceParams(tab);
};
@@ -666,9 +680,11 @@ class ResourceCenter extends PureComponent {
}
if (activeTab === 'network') {
- const portCount = list.reduce((total, item) => total + ((item.ports || []).length || 0), 0);
- const exposedCount = list.filter(item => item.type && item.type !== 'ClusterIP').length;
- const selectorlessCount = list.filter(item => !item.selector || Object.keys(item.selector).length === 0).length;
+ const serviceList = list.filter(item => ((item.kind || 'Service').toLowerCase() === 'service'));
+ const ingressCount = list.filter(item => ((item.kind || '').toLowerCase() === 'ingress')).length;
+ const portCount = serviceList.reduce((total, item) => total + ((item.ports || []).length || 0), 0);
+ const exposedCount = serviceList.filter(item => item.type && item.type !== 'ClusterIP').length + ingressCount;
+ const selectorlessCount = serviceList.filter(item => !item.selector || Object.keys(item.selector).length === 0).length;
return [
{ label: formatMessage({ id: 'resourceCenter.metrics.network.total' }), value: list.length, helper: formatMessage({ id: 'resourceCenter.metrics.network.totalHelper' }), tone: 'default' },
{ label: formatMessage({ id: 'resourceCenter.metrics.network.ports' }), value: portCount, helper: formatMessage({ id: 'resourceCenter.metrics.network.portsHelper' }), tone: 'running' },
@@ -842,6 +858,15 @@ class ResourceCenter extends PureComponent {
}));
};
+ handleNetworkDetail = (record) => {
+ const kind = ((record && record.kind) || '').toLowerCase();
+ if (kind === 'ingress') {
+ this.handleOpenResourceYaml(record, this.getRecordResourceParams(record, 'network'));
+ return;
+ }
+ this.jumpToServiceDetail(record);
+ };
+
jumpToHelmDetail = (record, query = {}) => {
const { dispatch } = this.props;
const { teamName, regionName } = this.getParams();
@@ -2100,8 +2125,8 @@ class ResourceCenter extends PureComponent {
onRefresh={() => this.fetchTabData(activeTab)}
refreshLoading={tabLoading}
onCreate={this.openCreateChooser}
- onDetail={this.jumpToServiceDetail}
- onEditYaml={record => this.handleOpenResourceYaml(record, { group: '', version: 'v1', resource: 'services' })}
+ onDetail={this.handleNetworkDetail}
+ onEditYaml={record => this.handleOpenResourceYaml(record, this.getRecordResourceParams(record, 'network'))}
onDelete={this.handleDeleteResource}
deletingName={deletingResourceName}
yamlLoadingName={openingYamlName}
@@ -2235,6 +2260,14 @@ class ResourceCenter extends PureComponent {
) : null}