From 3f36248e3169d53892fea55e5f371585e67b37ad Mon Sep 17 00:00:00 2001
From: Pavel Busko <pavel.busko@sap.com>
Date: Thu, 17 Oct 2024 14:26:56 +0200
Subject: [PATCH] fix merge conflict

---
 helm/korifi/job-task-runner/deployment.yaml | 2 --
 job-task-runner/main.go                     | 3 ---
 statefulset-runner/main.go                  | 5 +----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/helm/korifi/job-task-runner/deployment.yaml b/helm/korifi/job-task-runner/deployment.yaml
index c41072ea3..e2f809c1d 100644
--- a/helm/korifi/job-task-runner/deployment.yaml
+++ b/helm/korifi/job-task-runner/deployment.yaml
@@ -38,13 +38,11 @@ spec:
         - "--health-probe-bind-address=:8081"
         - "--leader-elect"
         - "--ttl={{ required "jobTTL is required" .Values.jobTaskRunner.jobTTL }}"
-        - "--add-seccomp-profile={{ .Values.jobTaskRunner.temporarySetPodSeccompProfile }}"
 {{- else }}
         args:
         - --health-probe-bind-address=:8081
         - --leader-elect
         - --ttl={{ required "jobTTL is required" .Values.jobTaskRunner.jobTTL }}
-        - --add-seccomp-profile={{ .Values.jobTaskRunner.temporarySetPodSeccompProfile }}
 {{- end }}
         livenessProbe:
           httpGet:
diff --git a/job-task-runner/main.go b/job-task-runner/main.go
index b0a31550c..3fe01dfa5 100644
--- a/job-task-runner/main.go
+++ b/job-task-runner/main.go
@@ -35,13 +35,11 @@ func main() {
 		enableLeaderElection bool
 		probeAddr            string
 		ttl                  string
-		addSeccompProfile    bool
 	)
 
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.StringVar(&ttl, "ttl", "24h", "The time to live for a task job.")
-	flag.BoolVar(&addSeccompProfile, "add-seccomp-profile", false, "Add temporary seccomp profile to the task job.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
@@ -82,7 +80,6 @@ func main() {
 		mgr.GetScheme(),
 		jobtaskcontrollers.NewStatusGetter(mgr.GetClient()),
 		jobTTL,
-		addSeccompProfile,
 	).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "TaskWorkload")
 		os.Exit(1)
diff --git a/statefulset-runner/main.go b/statefulset-runner/main.go
index 2e6a4a904..908b94c3c 100644
--- a/statefulset-runner/main.go
+++ b/statefulset-runner/main.go
@@ -99,10 +99,7 @@ func setupControllers(mgr manager.Manager) error {
 	if err := statefulsetcontrollers.NewAppWorkloadReconciler(
 		mgr.GetClient(),
 		mgr.GetScheme(),
-		statefulsetcontrollers.NewAppWorkloadToStatefulsetConverter(
-			mgr.GetScheme(),
-			false,
-		),
+		statefulsetcontrollers.NewAppWorkloadToStatefulsetConverter(mgr.GetScheme()),
 		statefulsetcontrollers.NewPDBUpdater(mgr.GetClient()),
 		controllersLog,
 	).SetupWithManager(mgr); err != nil {