Merge pull request #306 from kstrenkova/refactor-privilege-mode

Refactor Privileged parameter slightly

Author: arxcruz

controllers/ansibletest_controller.go

@@ -209,7 +209,6 @@ func (r *AnsibleTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	envVars, workflowOverrideParams := r.PrepareAnsibleEnv(instance)
 	logsPVCName := r.GetPVCLogsName(instance, 0)
 	containerImage, err := r.GetContainerImage(ctx, workflowOverrideParams["ContainerImage"], instance)
-	privileged := instance.Spec.Privileged
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -224,7 +223,6 @@ func (r *AnsibleTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		workflowOverrideParams,
 		nextWorkflowStep,
 		containerImage,
-		privileged,
 	)
 
 	ctrlResult, err = r.CreatePod(ctx, *helper, podDef)

controllers/tobiko_controller.go

@@ -309,7 +309,6 @@ func (r *TobikoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 	podName := r.GetPodName(instance, nextWorkflowStep)
 	logsPVCName := r.GetPVCLogsName(instance, workflowStepNum)
 	containerImage, err := r.GetContainerImage(ctx, instance.Spec.ContainerImage, instance)
-	privileged := instance.Spec.Privileged
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -325,7 +324,6 @@ func (r *TobikoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 		mountKubeconfig,
 		envVars,
 		containerImage,
-		privileged,
 	)
 
 	ctrlResult, err = r.CreatePod(ctx, *helper, podDef)

pkg/ansibletest/pod.go

@@ -20,14 +20,13 @@ func Pod(
 	workflowOverrideParams map[string]string,
 	externalWorkflowCounter int,
 	containerImage string,
-	privileged bool,
 ) *corev1.Pod {
 
 	runAsUser := int64(227)
 	runAsGroup := int64(227)
 
 	capabilities := []corev1.Capability{"NET_ADMIN", "NET_RAW"}
-	securityContext := util.GetSecurityContext(runAsUser, capabilities, privileged)
+	securityContext := util.GetSecurityContext(runAsUser, capabilities, instance.Spec.Privileged)
 
 	pod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{

pkg/tobiko/pod.go

@@ -21,14 +21,13 @@ func Pod(
 	mountKubeconfig bool,
 	envVars map[string]env.Setter,
 	containerImage string,
-	privileged bool,
 ) *corev1.Pod {
 
 	runAsUser := int64(42495)
 	runAsGroup := int64(42495)
 
 	capabilities := []corev1.Capability{"NET_ADMIN", "NET_RAW"}
-	securityContext := util.GetSecurityContext(runAsUser, capabilities, privileged)
+	securityContext := util.GetSecurityContext(runAsUser, capabilities, instance.Spec.Privileged)
 
 	pod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{