Skip to content

Commit

Permalink
feature: add flink kubernetes job deploy form
Browse files Browse the repository at this point in the history
  • Loading branch information
kalencaya committed Jul 21, 2023
1 parent d34ab3a commit 1beac5f
Show file tree
Hide file tree
Showing 13 changed files with 270 additions and 124 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import cn.sliew.scaleph.common.dict.flink.kubernetes.DeploymentKind;
import cn.sliew.scaleph.common.dict.flink.kubernetes.DeploymentMode;
import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState;
import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode;
import cn.sliew.scaleph.common.dict.image.ImagePullPolicy;
import cn.sliew.scaleph.common.dict.job.*;
import cn.sliew.scaleph.common.dict.seatunnel.*;
Expand Down Expand Up @@ -87,6 +88,7 @@ public enum DictType implements DictDefinition {
FLINK_KUBERNETES_DEPLOYMENT_MODE("deployment_mode", "Deployment 模式", DeploymentMode.class),
FLINK_KUBERNETES_DEPLOYMENT_KIND("deployment_kind", "Deployment 类型", DeploymentKind.class),
FLINK_KUBERNETES_RESOURCE_LIFECYCLE_STATE("resource_lifecycle_state", "Deployment 状态", ResourceLifecycleState.class),
FLINK_KUBERNETES_UPGRADE_MODE("upgrade_mode", "Upgrade 方式", UpgradeMode.class),

FLINK_CATALOG_COLUMN_TYPE("flink_catalog_column_type", "Flink Catalog Table Schema 列类型", CatalogColumnType.class),
FLINK_CATALOG_TABLE_KIND("flink_catalog_table_kind", "Flink Catalog Table 类型", CatalogTableKind.class),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package cn.sliew.scaleph.common.dict.flink.kubernetes;

import cn.sliew.scaleph.common.dict.DictInstance;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Arrays;

@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum UpgradeMode implements DictInstance {

STATELESS("stateless", "stateless"),
LAST_STATE("last-state", "last-state"),
SAVEPOINT("savepoint", "savepoint"),
;

@JsonCreator
public static UpgradeMode of(String value) {
return Arrays.stream(values())
.filter(instance -> instance.getValue().equals(value))
.findAny().orElseThrow(() -> new EnumConstantNotPresentException(UpgradeMode.class, value));
}

@EnumValue
private String value;
private String label;

UpgradeMode(String value, String label) {
this.value = value;
this.label = label;
}

@Override
public String getValue() {
return value;
}

@Override
public String getLabel() {
return label;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package cn.sliew.scaleph.dao.entity.master.ws;

import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState;
import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode;
import cn.sliew.scaleph.dao.entity.BaseDO;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
Expand Down Expand Up @@ -50,6 +51,9 @@ public class WsFlinkKubernetesJobInstance extends BaseDO {
@TableField("parallelism")
private Integer parallelism;

@TableField("upgrade_mode")
private UpgradeMode upgradeMode;

@TableField("job_manager")
private String jobManager;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public void handle(WsFlinkKubernetesJobInstanceDTO jobInstanceDTO, FlinkDeployme

public ConfigMap buildSeaTunnelConf(String instanceId, Long wsDiJobId, ObjectMeta objectMeta) throws Exception {
WsDiJobDTO wsDiJobDTO = wsDiJobService.queryJobGraph(wsDiJobId);
wsDiJobDTO.getWsFlinkArtifact().setName(instanceId);
String prettyJson = seatunnelConfigService.buildConfig(wsDiJobDTO);
String plainJson = JacksonUtil.toJsonNode(prettyJson).toString();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package cn.sliew.scaleph.engine.flink.kubernetes.service.dto;

import cn.sliew.scaleph.common.dict.flink.kubernetes.ResourceLifecycleState;
import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode;
import cn.sliew.scaleph.dao.entity.BaseDO;
import cn.sliew.scaleph.engine.flink.kubernetes.operator.spec.JobManagerSpec;
import cn.sliew.scaleph.engine.flink.kubernetes.operator.spec.TaskManagerSpec;
Expand Down Expand Up @@ -52,6 +53,9 @@ public class WsFlinkKubernetesJobInstanceDTO extends BaseDO {
@Schema(description = "parallelism")
private Integer parallelism;

@Schema(description = "upgrade mode")
private UpgradeMode upgradeMode;

@Schema(description = "job manager")
private JobManagerSpec jobManager;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package cn.sliew.scaleph.engine.flink.kubernetes.service.param;

import cn.sliew.scaleph.common.dict.flink.kubernetes.UpgradeMode;
import cn.sliew.scaleph.engine.flink.kubernetes.operator.spec.JobManagerSpec;
import cn.sliew.scaleph.engine.flink.kubernetes.operator.spec.TaskManagerSpec;
import io.swagger.v3.oas.annotations.media.Schema;
Expand All @@ -36,6 +37,9 @@ public class WsFlinkKubernetesJobInstanceDeployParam {
@Schema(description = "parallelism")
private Integer parallelism;

@Schema(description = "upgrade mode")
private UpgradeMode upgradeMode;

@Schema(description = "job manager")
private JobManagerSpec jobManager;

Expand Down
1 change: 1 addition & 0 deletions scaleph-ui-react/src/constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export const DICT_TYPE = {

deploymentKind: 'deployment_kind',
resourceLifecycleState: 'resource_lifecycle_state',
upgradeMode: 'upgrade_mode',


};
Expand Down
14 changes: 14 additions & 0 deletions scaleph-ui-react/src/locales/zh-CN/pages/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,13 +794,27 @@ export default {

'pages.project.flink.kubernetes.job.detail': '详情',
'pages.project.flink.kubernetes.job.detail.deploy': 'Deploy',
'pages.project.flink.kubernetes.job.detail.deploy.resource': 'Resource',
'pages.project.flink.kubernetes.job.detail.deploy.resource.jobManagerCpu': 'JobManager CPU',
'pages.project.flink.kubernetes.job.detail.deploy.resource.jobManagerMemory': 'JobManager Memory',
'pages.project.flink.kubernetes.job.detail.deploy.resource.jobManagerReplicas': 'JobManager Replicas',
'pages.project.flink.kubernetes.job.detail.deploy.resource.taskManagerCpu': 'TaskManager CPU',
'pages.project.flink.kubernetes.job.detail.deploy.resource.taskManagerMemory': 'TaskManager Memory',
'pages.project.flink.kubernetes.job.detail.deploy.resource.taskManagerReplicas': 'TaskManager Replicas',
'pages.project.flink.kubernetes.job.detail.deploy.resource.parallelism': 'Parallelism',
'pages.project.flink.kubernetes.job.detail.deploy.resource.userFlinkConfiguration': 'Flink配置',
'pages.project.flink.kubernetes.job.detail.deploy.state': 'State',
'pages.project.flink.kubernetes.job.detail.deploy.state.upgradeMode': 'Upgrade 方式',

'pages.project.flink.kubernetes.job.detail.suspend': 'Suspend',
'pages.project.flink.kubernetes.job.detail.shutdown': 'Shutdown',
'pages.project.flink.kubernetes.job.detail.savepoint': 'Savepoint',
'pages.project.flink.kubernetes.job.detail.flinkui': 'Flink UI',
'pages.project.flink.kubernetes.job.detail.metrics': 'Metrics',
'pages.project.flink.kubernetes.job.detail.logs': 'Logs',



'pages.project.flink.kubernetes.job.detail.yaml': 'YAML',

};
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import {useIntl} from "umi";
import React from "react";
import {ProFormDigit, ProFormGroup, ProFormText, ProFormTextArea} from "@ant-design/pro-components";

const FlinkKubernetesJobDeployResourceStepForm: React.FC = () => {
const intl = useIntl();

return (
<ProFormGroup>
<ProFormDigit
name="jobManagerCpu"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.jobManagerCpu'})}
colProps={{span: 10, offset: 1}}
rules={[{required: true}]}
initialValue={1.0}
fieldProps={{
min: 0,
precision: 2
}}
/>
<ProFormDigit
name="taskManagerCpu"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.taskManagerCpu'})}
colProps={{span: 10, offset: 1}}
rules={[{required: true}]}
initialValue={1.0}
fieldProps={{
min: 0,
precision: 2
}}
/>
<ProFormText
name="jobManagerMemory"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.jobManagerMemory'})}
colProps={{span: 10, offset: 1}}
rules={[{required: true}]}
initialValue={"1G"}
/>
<ProFormText
name="taskManagerMemory"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.taskManagerMemory'})}
colProps={{span: 10, offset: 1}}
rules={[{required: true}]}
initialValue={"1G"}
/>
<ProFormDigit
name="jobManagerReplicas"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.jobManagerReplicas'})}
colProps={{span: 10, offset: 1}}
initialValue={1}
fieldProps={{
min: 1
}}
/>
<ProFormDigit
name="taskManagerReplicas"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.taskManagerReplicas'})}
colProps={{span: 10, offset: 1}}
initialValue={1}
fieldProps={{
min: 1
}}
/>
<ProFormDigit
name="parallelism"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.parallelism'})}
colProps={{span: 10, offset: 1}}
rules={[{required: true}]}
initialValue={1}
fieldProps={{
min: 1
}}
/>
<ProFormTextArea
name="userFlinkConfiguration"
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.resource.userFlinkConfiguration'})}
colProps={{span: 23, offset: 1}}
/>
</ProFormGroup>
);
}

export default FlinkKubernetesJobDeployResourceStepForm;
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import {useIntl} from "umi";
import React from "react";
import {ProFormGroup, ProFormRadio} from "@ant-design/pro-components";
import {DictDataService} from "@/services/admin/dictData.service";
import {DICT_TYPE} from "@/constant";

const FlinkKubernetesJobDeployStateStepForm: React.FC = () => {
const intl = useIntl();

return (
<ProFormGroup>
<ProFormRadio.Group
name={"upgradeMode"}
label={intl.formatMessage({id: 'pages.project.flink.kubernetes.job.detail.deploy.state.upgradeMode'})}
rules={[{required: true}]}
request={() => {
return DictDataService.listDictDataByType2(DICT_TYPE.upgradeMode)
}}
/>

</ProFormGroup>
);
}

export default FlinkKubernetesJobDeployStateStepForm;
Loading

0 comments on commit 1beac5f

Please sign in to comment.