Skip to content

Commit 7ff26c0

Browse files
avoid potential nil pointer (#2182)
1 parent cb96689 commit 7ff26c0

File tree

1 file changed

+26
-25
lines changed

1 file changed

+26
-25
lines changed

pkg/resources/statefulsets/minio-statefulset.go

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -421,34 +421,35 @@ func poolContainerSecurityContext(pool *miniov2.Pool) *corev1.SecurityContext {
421421
var runAsUser int64 = 1000
422422
var runAsGroup int64 = 1000
423423
poolSCSet := false
424-
425-
// Values from pool.SecurityContext ONLY if provided
426-
if pool.SecurityContext != nil {
427-
if pool.SecurityContext.RunAsNonRoot != nil {
428-
runAsNonRoot = *pool.SecurityContext.RunAsNonRoot
429-
poolSCSet = true
430-
}
431-
if pool.SecurityContext.RunAsUser != nil {
432-
runAsUser = *pool.SecurityContext.RunAsUser
433-
poolSCSet = true
434-
}
435-
if pool.SecurityContext.RunAsGroup != nil {
436-
runAsGroup = *pool.SecurityContext.RunAsGroup
437-
poolSCSet = true
438-
}
439-
if poolSCSet {
440-
// Only set values if one of above is set otherwise let it empty
441-
containerSecurityContext = corev1.SecurityContext{
442-
RunAsNonRoot: &runAsNonRoot,
443-
RunAsUser: &runAsUser,
444-
RunAsGroup: &runAsGroup,
424+
if pool != nil {
425+
// Values from pool.SecurityContext ONLY if provided
426+
if pool.SecurityContext != nil {
427+
if pool.SecurityContext.RunAsNonRoot != nil {
428+
runAsNonRoot = *pool.SecurityContext.RunAsNonRoot
429+
poolSCSet = true
430+
}
431+
if pool.SecurityContext.RunAsUser != nil {
432+
runAsUser = *pool.SecurityContext.RunAsUser
433+
poolSCSet = true
434+
}
435+
if pool.SecurityContext.RunAsGroup != nil {
436+
runAsGroup = *pool.SecurityContext.RunAsGroup
437+
poolSCSet = true
438+
}
439+
if poolSCSet {
440+
// Only set values if one of above is set otherwise let it empty
441+
containerSecurityContext = corev1.SecurityContext{
442+
RunAsNonRoot: &runAsNonRoot,
443+
RunAsUser: &runAsUser,
444+
RunAsGroup: &runAsGroup,
445+
}
445446
}
446447
}
447-
}
448448

449-
// Values from pool.ContainerSecurityContext if provided
450-
if pool != nil && pool.ContainerSecurityContext != nil {
451-
containerSecurityContext = *pool.ContainerSecurityContext
449+
// Values from pool.ContainerSecurityContext if provided
450+
if pool.ContainerSecurityContext != nil {
451+
containerSecurityContext = *pool.ContainerSecurityContext
452+
}
452453
}
453454
return &containerSecurityContext
454455
}

0 commit comments

Comments
 (0)