Skip to content

[Chore] Move generateK8sTaskExecutionContext from AbstractParameters to K8sTaskParameters #17976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SbloodyS merged 3 commits into from
Feb 22, 2026
Merged

[Chore] Move generateK8sTaskExecutionContext from AbstractParameters to K8sTaskParameters #17976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08a9d33
[Chore] Move generateK8sTaskExecutionContext from AbstractParameters …
ruanwenjun Feb 13, 2026
65aad3f
Merge branch 'dev' into dev_wenjun_polishK8sTaskExecutionContext
SbloodyS Feb 22, 2026
63d16ef
Merge branch 'dev' into dev_wenjun_polishK8sTaskExecutionContext
SbloodyS Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions ...pi/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@

import java.io.Serializable;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -28,6 +31,9 @@
* k8s Task ExecutionContext
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class K8sTaskExecutionContext implements Serializable {

private String configYaml;
Expand All @@ -36,23 +42,11 @@ public class K8sTaskExecutionContext implements Serializable {

private String connectionParams;

public K8sTaskExecutionContext() {
}

@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
public K8sTaskExecutionContext(
@JsonProperty("configYaml") String configYaml,
@JsonProperty("namespace") String namespace) {
this.configYaml = configYaml;
this.namespace = namespace;
}

@Override
public String toString() {
return "K8sTaskExecutionContext{"
+ "namespace=" + namespace
+ ", configYaml='" + configYaml + '\''
+ ", connectionParams='" + connectionParams + '\''
+ '}';
}
}
13 changes: 0 additions & 13 deletions .../main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@
package org.apache.dolphinscheduler.plugin.task.api.parameters;

import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;
import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils;

Expand Down Expand Up @@ -72,16 +69,6 @@ public Map<String, Property> getLocalParametersMap() {
return localParametersMaps;
}

public K8sTaskExecutionContext generateK8sTaskExecutionContext(ResourceParametersHelper parametersHelper,
int datasource) {
DataSourceParameters dataSourceParameters =
(DataSourceParameters) parametersHelper.getResourceParameters(ResourceType.DATASOURCE, datasource);
K8sTaskExecutionContext k8sTaskExecutionContext = new K8sTaskExecutionContext();
k8sTaskExecutionContext.setConnectionParams(
Objects.nonNull(dataSourceParameters) ? dataSourceParameters.getConnectionParams() : null);
return k8sTaskExecutionContext;
}

/**
* get input local parameters map if the param direct is IN
*
Expand Down
22 changes: 19 additions & 3 deletions ...c/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@

package org.apache.dolphinscheduler.plugin.task.api.parameters;

import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType;
import org.apache.dolphinscheduler.plugin.task.api.model.Label;
import org.apache.dolphinscheduler.plugin.task.api.model.NodeSelectorExpression;
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;

import org.apache.commons.lang3.StringUtils;
Expand All @@ -31,9 +33,6 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

/**
* k8s task parameters
*/
@Data
@Slf4j
public class K8sTaskParameters extends AbstractParameters {
Expand Down Expand Up @@ -67,4 +66,21 @@ public ResourceParametersHelper getResources() {
resources.put(ResourceType.DATASOURCE, datasource);
return resources;
}

public K8sTaskExecutionContext generateK8sTaskExecutionContext(
ResourceParametersHelper parametersHelper,
int datasource) {
DataSourceParameters dataSourceParameters =
(DataSourceParameters) parametersHelper
.getResourceParameters(ResourceType.DATASOURCE, datasource);

String connectionParams = null;
if (dataSourceParameters != null) {
connectionParams = dataSourceParameters.getConnectionParams();
}

return K8sTaskExecutionContext.builder()
.connectionParams(connectionParams)
.build();
}
}
Loading