Made recommended changes!

rancher · Aug 30, 2023 · f4a9a0f · f4a9a0f
1 parent 526f1f0
commit f4a9a0f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/pkg/apis/upgrade.cattle.io/v1/types.go b/pkg/apis/upgrade.cattle.io/v1/types.go
@@ -67,7 +67,6 @@ type ContainerSpec struct {
 	EnvFrom         []corev1.EnvFromSource  `json:"envFrom,omitempty"`
 	Volumes         []VolumeSpec            `json:"volumes,omitempty"`
 	SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`
-	SELinuxOptions  *corev1.SELinuxOptions  `json:"seLinuxOptions,omitempty"`
 }
 
 type VolumeSpec struct {

diff --git a/pkg/apis/upgrade.cattle.io/v1/zz_generated_deepcopy.go b/pkg/apis/upgrade.cattle.io/v1/zz_generated_deepcopy.go
diff --git a/pkg/upgrade/container/container.go b/pkg/upgrade/container/container.go
@@ -37,12 +37,6 @@ func WithSecurityContext(securityContext *corev1.SecurityContext) Option {
 	}
 }
 
-func WithSELinuxOptions(seLinuxoptions *corev1.SELinuxOptions) Option {
-	return func(container *corev1.Container) {
-		container.SecurityContext.SELinuxOptions = seLinuxoptions
-	}
-}
-
 func WithImagePullPolicy(pullPolicy corev1.PullPolicy) Option {
 	return func(container *corev1.Container) {
 		container.ImagePullPolicy = pullPolicy

diff --git a/pkg/upgrade/job/job.go b/pkg/upgrade/job/job.go
@@ -245,6 +245,7 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
 				upgradectr.WithPlanEnvironment(plan.Name, plan.Status),
 				upgradectr.WithImagePullPolicy(ImagePullPolicy),
 				upgradectr.WithVolumes(plan.Spec.Upgrade.Volumes),
+				upgradectr.WithSecurityContext(plan.Spec.Upgrade.SecurityContext),
 			),
 		)
 	}
@@ -332,18 +333,15 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
 		securityContext = plan.Spec.Upgrade.SecurityContext
 	}
 
-	// Check if SELinuxOptions from the Plan is non-nil
-	seLinuxOptions := &corev1.SELinuxOptions{}
-	if plan.Spec.Upgrade.SELinuxOptions != nil {
-		seLinuxOptions = plan.Spec.Upgrade.SELinuxOptions
+	if plan.Spec.Upgrade.SecurityContext.SELinuxOptions != nil {
+		securityContext.SELinuxOptions = plan.Spec.Upgrade.SecurityContext.SELinuxOptions
 	}
 
 	// and finally, we upgrade
 	podTemplate.Spec.Containers = []corev1.Container{
 		upgradectr.New("upgrade", *plan.Spec.Upgrade,
 			upgradectr.WithLatestTag(plan.Status.LatestVersion),
 			upgradectr.WithSecurityContext(securityContext),
-			upgradectr.WithSELinuxOptions(seLinuxOptions),
 			upgradectr.WithSecrets(plan.Spec.Secrets),
 			upgradectr.WithPlanEnvironment(plan.Name, plan.Status),
 			upgradectr.WithImagePullPolicy(ImagePullPolicy),