Skip to content

Commit 502149d

Browse files
committed
Remove hardcoded job's user ID
1 parent ab6bc98 commit 502149d

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

controllers/lmes/lmevaljob_controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,6 @@ func (r *LMEvalJobReconciler) createPod(job *lmesv1alpha1.LMEvalJob, log logr.Lo
662662
var allowPrivilegeEscalation = false
663663
var runAsNonRootUser = true
664664
var ownerRefController = true
665-
var runAsUser int64 = 1001030000
666665

667666
var envVars = job.Spec.Pod.GetContainer().GetEnv()
668667

@@ -717,7 +716,6 @@ func (r *LMEvalJobReconciler) createPod(job *lmesv1alpha1.LMEvalJob, log logr.Lo
717716
Command: []string{DriverPath, "--copy", DestDriverPath},
718717
SecurityContext: &corev1.SecurityContext{
719718
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
720-
RunAsUser: &runAsUser,
721719
Capabilities: &corev1.Capabilities{
722720
Drop: []corev1.Capability{
723721
"ALL",
@@ -742,7 +740,6 @@ func (r *LMEvalJobReconciler) createPod(job *lmesv1alpha1.LMEvalJob, log logr.Lo
742740
Args: r.generateArgs(job, log),
743741
SecurityContext: &corev1.SecurityContext{
744742
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
745-
RunAsUser: &runAsUser,
746743
Capabilities: &corev1.Capabilities{
747744
Drop: []corev1.Capability{
748745
"ALL",

controllers/lmes/lmevaljob_controller_test.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ import (
3030
)
3131

3232
var (
33-
isController = true
34-
allowPrivilegeEscalation = false
35-
runAsNonRootUser = true
36-
runAsUser int64 = 1001030000
33+
isController = true
34+
allowPrivilegeEscalation = false
35+
runAsNonRootUser = true
3736
)
3837

3938
func Test_SimplePod(t *testing.T) {
@@ -97,7 +96,6 @@ func Test_SimplePod(t *testing.T) {
9796
Command: []string{DriverPath, "--copy", DestDriverPath},
9897
SecurityContext: &corev1.SecurityContext{
9998
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
100-
RunAsUser: &runAsUser,
10199
Capabilities: &corev1.Capabilities{
102100
Drop: []corev1.Capability{
103101
"ALL",
@@ -121,7 +119,6 @@ func Test_SimplePod(t *testing.T) {
121119
Args: lmevalRec.generateArgs(job, log),
122120
SecurityContext: &corev1.SecurityContext{
123121
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
124-
RunAsUser: &runAsUser,
125122
Capabilities: &corev1.Capabilities{
126123
Drop: []corev1.Capability{
127124
"ALL",
@@ -259,7 +256,6 @@ func Test_WithLabelsAnnotationsResourcesVolumes(t *testing.T) {
259256
Command: []string{DriverPath, "--copy", DestDriverPath},
260257
SecurityContext: &corev1.SecurityContext{
261258
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
262-
RunAsUser: &runAsUser,
263259
Capabilities: &corev1.Capabilities{
264260
Drop: []corev1.Capability{
265261
"ALL",
@@ -283,7 +279,6 @@ func Test_WithLabelsAnnotationsResourcesVolumes(t *testing.T) {
283279
Args: lmevalRec.generateArgs(job, log),
284280
SecurityContext: &corev1.SecurityContext{
285281
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
286-
RunAsUser: &runAsUser,
287282
Capabilities: &corev1.Capabilities{
288283
Drop: []corev1.Capability{
289284
"ALL",
@@ -430,7 +425,6 @@ func Test_EnvSecretsPod(t *testing.T) {
430425
Command: []string{DriverPath, "--copy", DestDriverPath},
431426
SecurityContext: &corev1.SecurityContext{
432427
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
433-
RunAsUser: &runAsUser,
434428
Capabilities: &corev1.Capabilities{
435429
Drop: []corev1.Capability{
436430
"ALL",
@@ -467,7 +461,6 @@ func Test_EnvSecretsPod(t *testing.T) {
467461
Args: lmevalRec.generateArgs(job, log),
468462
SecurityContext: &corev1.SecurityContext{
469463
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
470-
RunAsUser: &runAsUser,
471464
Capabilities: &corev1.Capabilities{
472465
Drop: []corev1.Capability{
473466
"ALL",
@@ -592,7 +585,6 @@ func Test_FileSecretsPod(t *testing.T) {
592585
Command: []string{DriverPath, "--copy", DestDriverPath},
593586
SecurityContext: &corev1.SecurityContext{
594587
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
595-
RunAsUser: &runAsUser,
596588
Capabilities: &corev1.Capabilities{
597589
Drop: []corev1.Capability{
598590
"ALL",
@@ -616,7 +608,6 @@ func Test_FileSecretsPod(t *testing.T) {
616608
Args: lmevalRec.generateArgs(job, log),
617609
SecurityContext: &corev1.SecurityContext{
618610
AllowPrivilegeEscalation: &allowPrivilegeEscalation,
619-
RunAsUser: &runAsUser,
620611
Capabilities: &corev1.Capabilities{
621612
Drop: []corev1.Capability{
622613
"ALL",

0 commit comments

Comments
 (0)