diff --git a/internal/deployer/factory.go b/internal/deployer/factory.go
index 77fd7d77..fd617d6d 100644
--- a/internal/deployer/factory.go
+++ b/internal/deployer/factory.go
@@ -221,6 +221,7 @@ func createDeployer(target string, accessConfig string, deployConfig map[string]
KubeConfig: access.KubeConfig,
Namespace: maps.GetValueOrDefaultAsString(deployConfig, "namespace", "default"),
SecretName: maps.GetValueAsString(deployConfig, "secretName"),
+ SecretType: maps.GetValueOrDefaultAsString(deployConfig, "secretType", "kubernetes.io/tls"),
SecretDataKeyForCrt: maps.GetValueOrDefaultAsString(deployConfig, "secretDataKeyForCrt", "tls.crt"),
SecretDataKeyForKey: maps.GetValueOrDefaultAsString(deployConfig, "secretDataKeyForKey", "tls.key"),
}, logger)
diff --git a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go
index 8dae9aef..f09e8331 100644
--- a/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go
+++ b/internal/pkg/core/deployer/providers/k8s-secret/k8s_secret.go
@@ -20,13 +20,15 @@ import (
type K8sSecretDeployerConfig struct {
// kubeconfig 文件内容。
KubeConfig string `json:"kubeConfig,omitempty"`
- // K8s 命名空间。
+ // Kubernetes 命名空间。
Namespace string `json:"namespace,omitempty"`
- // K8s Secret 名称。
+ // Kubernetes Secret 名称。
SecretName string `json:"secretName"`
- // K8s Secret 中用于存放证书的 Key。
+ // Kubernetes Secret 类型。
+ SecretType string `json:"secretType"`
+ // Kubernetes Secret 中用于存放证书的 Key。
SecretDataKeyForCrt string `json:"secretDataKeyForCrt,omitempty"`
- // K8s Secret 中用于存放私钥的 Key。
+ // Kubernetes Secret 中用于存放私钥的 Key。
SecretDataKeyForKey string `json:"secretDataKeyForKey,omitempty"`
}
@@ -102,7 +104,7 @@ func (d *K8sSecretDeployer) Deploy(ctx context.Context, certPem string, privkeyP
Name: d.config.SecretName,
Annotations: secretAnnotations,
},
- Type: k8sCore.SecretType("kubernetes.io/tls"),
+ Type: k8sCore.SecretType(d.config.SecretType),
}
secretPayload.Data = make(map[string][]byte)
secretPayload.Data[d.config.SecretDataKeyForCrt] = []byte(certPem)
@@ -118,7 +120,7 @@ func (d *K8sSecretDeployer) Deploy(ctx context.Context, certPem string, privkeyP
}
// 更新 Secret 实例
- secretPayload.Type = k8sCore.SecretType("kubernetes.io/tls")
+ secretPayload.Type = k8sCore.SecretType(d.config.SecretType)
if secretPayload.ObjectMeta.Annotations == nil {
secretPayload.ObjectMeta.Annotations = secretAnnotations
} else {
diff --git a/ui/src/components/workflow/End.tsx b/ui/src/components/workflow/End.tsx
index 2047a8ea..072674d6 100644
--- a/ui/src/components/workflow/End.tsx
+++ b/ui/src/components/workflow/End.tsx
@@ -5,7 +5,7 @@ const End = () => {
return (
-
{t("workflow_node.end.title")}
+
{t("workflow_node.end.label")}
);
};
diff --git a/ui/src/components/workflow/node/DeployNodeFormAliyunCLBFields.tsx b/ui/src/components/workflow/node/DeployNodeFormAliyunCLBFields.tsx
index e0ca9b9b..6140bcc2 100644
--- a/ui/src/components/workflow/node/DeployNodeFormAliyunCLBFields.tsx
+++ b/ui/src/components/workflow/node/DeployNodeFormAliyunCLBFields.tsx
@@ -45,6 +45,10 @@ const DeployNodeFormAliyunCLBFields = () => {
const formRule = createSchemaFieldRule(formSchema);
const formInst = Form.useFormInstance();
+ const initialValues: Partial> = {
+ listenerPort: 443,
+ };
+
const fieldResourceType = Form.useWatch("resourceType", formInst);
return (
@@ -84,7 +88,7 @@ const DeployNodeFormAliyunCLBFields = () => {
label={t("workflow_node.deploy.form.aliyun_clb_listener_port.label")}
rules={[formRule]}
tooltip={}
- initialValue={443}
+ initialValue={initialValues.listenerPort}
>
diff --git a/ui/src/components/workflow/node/DeployNodeFormKubernetesSecretFields.tsx b/ui/src/components/workflow/node/DeployNodeFormKubernetesSecretFields.tsx
index 86594924..f0a234b0 100644
--- a/ui/src/components/workflow/node/DeployNodeFormKubernetesSecretFields.tsx
+++ b/ui/src/components/workflow/node/DeployNodeFormKubernetesSecretFields.tsx
@@ -17,6 +17,11 @@ const DeployNodeFormKubernetesSecretFields = () => {
.nonempty(t("workflow_node.deploy.form.k8s_secret_name.placeholder"))
.max(256, t("common.errmsg.string_max", { max: 256 }))
.trim(),
+ secretType: z
+ .string({ message: t("workflow_node.deploy.form.k8s_secret_type.placeholder") })
+ .nonempty(t("workflow_node.deploy.form.k8s_secret_type.placeholder"))
+ .max(256, t("common.errmsg.string_max", { max: 256 }))
+ .trim(),
secretDataKeyForCrt: z
.string({ message: t("workflow_node.deploy.form.k8s_secret_data_key_for_crt.placeholder") })
.nonempty(t("workflow_node.deploy.form.k8s_secret_data_key_for_crt.placeholder"))
@@ -30,6 +35,13 @@ const DeployNodeFormKubernetesSecretFields = () => {
});
const formRule = createSchemaFieldRule(formSchema);
+ const initialValues: Partial> = {
+ namespace: "default",
+ secretType: "kubernetes.io/tls",
+ secretDataKeyForCrt: "tls.crt",
+ secretDataKeyForKey: "tls.key",
+ };
+
return (
<>
{
label={t("workflow_node.deploy.form.k8s_namespace.label")}
rules={[formRule]}
tooltip={}
- initialValue="default"
+ initialValue={initialValues.namespace}
>
@@ -51,12 +63,22 @@ const DeployNodeFormKubernetesSecretFields = () => {
+ }
+ initialValue={initialValues.secretType}
+ >
+
+
+
}
- initialValue="tls.crt"
+ initialValue={initialValues.secretDataKeyForCrt}
>
@@ -66,7 +88,7 @@ const DeployNodeFormKubernetesSecretFields = () => {
label={t("workflow_node.deploy.form.k8s_secret_data_key_for_key.label")}
rules={[formRule]}
tooltip={}
- initialValue="tls.key"
+ initialValue={initialValues.secretDataKeyForKey}
>
diff --git a/ui/src/components/workflow/node/DeployNodeFormLocalFields.tsx b/ui/src/components/workflow/node/DeployNodeFormLocalFields.tsx
index 25024329..7661faa7 100644
--- a/ui/src/components/workflow/node/DeployNodeFormLocalFields.tsx
+++ b/ui/src/components/workflow/node/DeployNodeFormLocalFields.tsx
@@ -71,6 +71,13 @@ const DeployNodeFormLocalFields = () => {
const formRule = createSchemaFieldRule(formSchema);
const formInst = Form.useFormInstance();
+ const initialValues: Partial> = {
+ format: FORMAT_PEM,
+ certPath: "/etc/ssl/certs/cert.crt",
+ keyPath: "/etc/ssl/certs/cert.key",
+ shellEnv: SHELLENV_SH,
+ };
+
const fieldFormat = Form.useWatch("format", formInst);
const fieldCertPath = Form.useWatch("certPath", formInst);
@@ -183,7 +190,7 @@ Remove-Item -Path "$pfxPath" -Force
return (
<>
-
+
@@ -213,7 +220,7 @@ Remove-Item -Path "$pfxPath" -Force
label={t("workflow_node.deploy.form.local_key_path.label")}
rules={[formRule]}
tooltip={}
- initialValue="/etc/ssl/certs/cert.key"
+ initialValue={initialValues.keyPath}
>
@@ -259,7 +266,7 @@ Remove-Item -Path "$pfxPath" -Force
-
+