Skip to content

Commit be1e842

Browse files
committed
feat #OBS-I684 separate sec context references for flink and spark
1 parent 2a4a808 commit be1e842

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

command-service/src/command/connector_command.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ def _perform_flink_install(self, dataset_id, connector_instance):
186186

187187
flink_jobs_json = json.dumps(flink_jobs)
188188
nodeSelector = self.config.find("node_selector")
189-
security_contexts = self.config.find("container_security_context")
190-
pod_security_context = self.config.find("pod_security_context")
189+
security_contexts = self.config.find("flink_connector_container_security_context")
190+
pod_security_context = self.config.find("flink_connector_pod_security_context")
191191
task_manager_limits = {
192192
"cpu": len(instance_ids),
193193
"memory": "{}Mi".format(len(instance_ids)*1024)
@@ -204,16 +204,11 @@ def _perform_flink_install(self, dataset_id, connector_instance):
204204
"--set", "namespace={}".format(namespace),
205205
"--set", "connector_id={}".format(connector_instance.connector_id),
206206
"--set", "flink_conf.taskmanager\\.numberOfTaskSlots={}".format(len(instance_ids)),
207-
"--set-json",
208-
f"""flink_jobs={flink_jobs_json.replace(" ", "")}""",
209-
"--set-json",
210-
f"""nodeSelector={json.dumps(nodeSelector)}""",
211-
"--set-json",
212-
f"""securityContext={json.dumps(security_contexts)}""",
213-
"--set-json",
214-
f"""podSecurityContext={json.dumps(pod_security_context)}""",
215-
"--set-json",
216-
f"""flink_resources.taskmanager.resources.limits={json.dumps(task_manager_limits)}"""
207+
"--set-json", f"""flink_jobs={flink_jobs_json.replace(" ", "")}""",
208+
"--set-json", f"""nodeSelector={json.dumps(nodeSelector)}""",
209+
"--set-json", f"""securityContext={json.dumps(security_contexts)}""",
210+
"--set-json", f"""podSecurityContext={json.dumps(pod_security_context)}""",
211+
"--set-json", f"""flink_resources.taskmanager.resources.limits={json.dumps(task_manager_limits)}"""
217212
]
218213

219214
print("flink connector installation: ", " ".join(helm_install_cmd))
@@ -268,8 +263,8 @@ def _perform_spark_install(self, dataset_id, connector_instance):
268263

269264
namespace = self.connector_job_config["spark"]["namespace"]
270265
nodeSelector = self.config.find("node_selector")
271-
container_security_context = self.config.find("container_security_context")
272-
pod_security_context = self.config.find("pod_security_context")
266+
container_security_context = self.config.find("spark_connector_container_security_context")
267+
pod_security_context = self.config.find("spark_connector_pod_security_context")
273268

274269
helm_install_cmd = [
275270
"helm",

0 commit comments

Comments
 (0)