Skip to content

Commit

Permalink
Add ContainerSecurityContext to Pools (#1372)
Browse files Browse the repository at this point in the history
  • Loading branch information
@allanrogerr @harshavardhana
allanrogerr authored and harshavardhana committed Jan 3, 2023
1 parent c8b5c7b commit be8d825
Show file tree
Hide file tree
Showing 12 changed files with 210 additions and 10 deletions.
5 changes: 5 additions & 0 deletions examples/kustomization/base/tenant.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ spec:
runAsGroup: 1000
runAsNonRoot: true
fsGroup: 1000
## Configure container security context
containerSecurityContext:
runAsUser: 1000
runAsGroup: 1000
runAsNonRoot: true
## Enable automatic Kubernetes based certificate generation and signing as explained in
## https://kubernetes.io/docs/tasks/tls/managing-tls-in-a-cluster
requestAutoCert: true
Expand Down
4 changes: 4 additions & 0 deletions examples/kustomization/tenant-lite/tenant.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ spec:
resources:
requests:
storage: 2Gi
containerSecurityContext:
runAsUser: 1000
runAsGroup: 1000
runAsNonRoot: true
4 changes: 4 additions & 0 deletions helm/operator/templates/console-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ spec:
{{- with .Values.console.volumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
securityContext:
{{- with .Values.console.containerSecurityContext }}
{{- toYaml . | nindent 12 }}
{{- end }}
volumes:
{{- with .Values.console.volumes }}
{{- toYaml . | nindent 8 }}
Expand Down
61 changes: 61 additions & 0 deletions helm/operator/templates/minio.min.io_tenants.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7647,6 +7647,67 @@ spec:
additionalProperties:
type: string
type: object
containerSecurityContext:
properties:
allowPrivilegeEscalation:
type: boolean
capabilities:
properties:
add:
items:
type: string
type: array
drop:
items:
type: string
type: array
type: object
privileged:
type: boolean
procMount:
type: string
readOnlyRootFilesystem:
type: boolean
runAsGroup:
format: int64
type: integer
runAsNonRoot:
type: boolean
runAsUser:
format: int64
type: integer
seLinuxOptions:
properties:
level:
type: string
role:
type: string
type:
type: string
user:
type: string
type: object
seccompProfile:
properties:
localhostProfile:
type: string
type:
type: string
required:
- type
type: object
windowsOptions:
properties:
gmsaCredentialSpec:
type: string
gmsaCredentialSpecName:
type: string
hostProcess:
type: boolean
runAsUserName:
type: string
type: object
type: object
labels:
additionalProperties:
type: string
Expand Down
6 changes: 5 additions & 1 deletion helm/operator/templates/operator-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ spec:
{{ toYaml . | nindent 10 }}
{{- end }}
resources:
{{- toYaml .Values.operator.resources | nindent 12 }}
{{- toYaml .Values.operator.resources | nindent 12 }}
securityContext:
{{- with .Values.operator.containerSecurityContext }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.operator.initContainers }}
initContainers:
{{- toYaml . | nindent 8 }}
Expand Down
7 changes: 7 additions & 0 deletions helm/operator/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ operator:
runAsGroup: 1000
runAsNonRoot: true
fsGroup: 1000
containerSecurityContext:
runAsUser: 1000
runAsGroup: 1000
runAsNonRoot: true
nodeSelector: { }
affinity:
podAntiAffinity:
Expand Down Expand Up @@ -58,6 +62,9 @@ console:
securityContext:
runAsUser: 1000
runAsNonRoot: true
containerSecurityContext:
runAsUser: 1000
runAsNonRoot: true
ingress:
enabled: false
ingressClassName: ""
Expand Down
4 changes: 4 additions & 0 deletions helm/tenant/templates/tenant.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ spec:
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with (dig "containerSecurityContext" (dict) .) }}
containerSecurityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with (dig "topologySpreadConstraints" (list) .) }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
Expand Down
11 changes: 10 additions & 1 deletion helm/tenant/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,16 @@ tenant:
## Configure resource requests and limits for MinIO containers
resources: { }
## Configure security context
securityContext: { }
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
runAsNonRoot: true
## Configure container security context
containerSecurityContext:
runAsUser: 1000
runAsGroup: 1000
runAsNonRoot: true
## Configure topology constraints
topologySpreadConstraints: [ ]
## Configure Runtime Class
Expand Down
12 changes: 10 additions & 2 deletions pkg/apis/minio.min.io/v2/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,10 +628,18 @@ type Pool struct {
//
// * `runAsUser` +
//
// * `seLinuxOptions` +
//
// +optional
SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
// Specify the https://kubernetes.io/docs/tasks/configure-pod-container/security-context/[Security Context] of containers in the pool. The Operator supports only the following container security fields: +
//
// * `runAsGroup` +
//
// * `runAsNonRoot` +
//
// * `runAsUser` +
//
// +optional
ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
// *Optional* +
//
// Specify custom labels and annotations to append to the Pool.
Expand Down
25 changes: 25 additions & 0 deletions pkg/resources/statefulsets/minio-statefulset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ func poolMinioServerContainer(t *miniov2.Tenant, wsSecret *v1.Secret, skipEnvVar
LivenessProbe: t.Spec.Liveness,
ReadinessProbe: t.Spec.Readiness,
StartupProbe: t.Spec.Startup,
SecurityContext: poolContainerSecurityContext(pool),
}
}

Expand Down Expand Up @@ -403,6 +404,30 @@ func poolSecurityContext(pool *miniov2.Pool, status *miniov2.PoolStatus) *v1.Pod
return &securityContext
}

// Builds the security context for containers in a Pool
func poolContainerSecurityContext(pool *miniov2.Pool) *v1.SecurityContext {
runAsNonRoot := true
var runAsUser int64 = 1000
var runAsGroup int64 = 1000
// Default to Pod values
if pool.SecurityContext != nil {
runAsNonRoot = *pool.SecurityContext.RunAsNonRoot
runAsUser = *pool.SecurityContext.RunAsUser
runAsGroup = *pool.SecurityContext.RunAsGroup
}

containerSecurityContext := corev1.SecurityContext{
RunAsNonRoot: &runAsNonRoot,
RunAsUser: &runAsUser,
RunAsGroup: &runAsGroup,
}

if pool != nil && pool.ContainerSecurityContext != nil {
containerSecurityContext = *pool.ContainerSecurityContext
}
return &containerSecurityContext
}

// NewPool creates a new StatefulSet for the given Cluster.
func NewPool(t *miniov2.Tenant, wsSecret *v1.Secret, skipEnvVars map[string][]byte, pool *miniov2.Pool, poolStatus *miniov2.PoolStatus, serviceName, hostsTemplate, operatorVersion string, operatorTLS bool, operatorCATLS bool) *appsv1.StatefulSet {
var podVolumes []corev1.Volume
Expand Down
61 changes: 61 additions & 0 deletions resources/base/crds/minio.min.io_tenants.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7647,6 +7647,67 @@ spec:
additionalProperties:
type: string
type: object
containerSecurityContext:
properties:
allowPrivilegeEscalation:
type: boolean
capabilities:
properties:
add:
items:
type: string
type: array
drop:
items:
type: string
type: array
type: object
privileged:
type: boolean
procMount:
type: string
readOnlyRootFilesystem:
type: boolean
runAsGroup:
format: int64
type: integer
runAsNonRoot:
type: boolean
runAsUser:
format: int64
type: integer
seLinuxOptions:
properties:
level:
type: string
role:
type: string
type:
type: string
user:
type: string
type: object
seccompProfile:
properties:
localhostProfile:
type: string
type:
type: string
required:
- type
type: object
windowsOptions:
properties:
gmsaCredentialSpec:
type: string
gmsaCredentialSpecName:
type: string
hostProcess:
type: boolean
runAsUserName:
type: string
type: object
type: object
labels:
additionalProperties:
type: string
Expand Down
20 changes: 14 additions & 6 deletions testing/deploy-tenant-upgrade.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,21 @@ function main() {

setup_kind

if [ -n "$lower_version" ]
error=$( {
if [ -n "$lower_version" ]
then
# Test specific version of operator
install_operator_version $lower_version
else
# Test latest release
install_operator_version
fi
} 2>&1 )

echo "$error"
if [ -n "$error" ]
then
# Test specific version of operator
install_operator_version $lower_version
else
# Test latest release
install_operator_version
install_operator
fi

install_tenant
Expand Down

0 comments on commit be8d825

Please sign in to comment.