Skip to content

Add support for SecurityContext in sidecar containers #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −6
Open

Add support for SecurityContext in sidecar containers #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/reference/cluster_manifest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,10 @@ defined in the sidecar dictionary:
[CPU and memory requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container)
for each sidecar container. Optional.

* **securityContext**
a [Kubernetes SecurityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
for each sidecar container. Optional.

### Requests

CPU and memory requests for the sidecar container.
Expand Down
11 changes: 6 additions & 5 deletions pkg/apis/acid.zalan.do/v1/postgresql_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,12 @@ type CloneDescription struct {

// Sidecar defines a container to be run in the same pod as the Postgres container.
type Sidecar struct {
*Resources `json:"resources,omitempty"`
Name string `json:"name,omitempty"`
DockerImage string `json:"image,omitempty"`
Ports []v1.ContainerPort `json:"ports,omitempty"`
Env []v1.EnvVar `json:"env,omitempty"`
*Resources `json:"resources,omitempty"`
Name string `json:"name,omitempty"`
DockerImage string `json:"image,omitempty"`
Ports []v1.ContainerPort `json:"ports,omitempty"`
Env []v1.EnvVar `json:"env,omitempty"`
SecurityContext *v1.SecurityContext `json:"securityContext,omitempty"`
}

// UserFlags defines flags (such as superuser, nologin) that could be assigned to individual users
Expand Down
1 change: 1 addition & 0 deletions pkg/cluster/k8sres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,7 @@ func getSidecarContainer(sidecar acidv1.Sidecar, index int, resources *v1.Resour
Resources: *resources,
Env: sidecar.Env,
Ports: sidecar.Ports,
SecurityContext: sidecar.SecurityContext,
}
}

Expand Down
18 changes: 17 additions & 1 deletion pkg/cluster/k8sres_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,6 +1801,8 @@ func TestSidecars(t *testing.T) {
}
}

trueValue := true

spec = acidv1.PostgresSpec{
PostgresqlParam: acidv1.PostgresqlParam{
PgVersion: "12.1",
Expand Down Expand Up @@ -1831,6 +1833,10 @@ func TestSidecars(t *testing.T) {
Name: "replace-sidecar",
DockerImage: "override-image",
},
acidv1.Sidecar{
Name: "security-context-sidecar",
SecurityContext: &v1.SecurityContext{AllowPrivilegeEscalation: &trueValue},
},
},
}

Expand Down Expand Up @@ -1921,7 +1927,7 @@ func TestSidecars(t *testing.T) {
}

// deduplicated sidecars and Patroni
assert.Equal(t, 7, len(s.Spec.Template.Spec.Containers), "wrong number of containers")
assert.Equal(t, 8, len(s.Spec.Template.Spec.Containers), "wrong number of containers")

// cluster specific sidecar
assert.Contains(t, s.Spec.Template.Spec.Containers, v1.Container{
Expand Down Expand Up @@ -1978,6 +1984,16 @@ func TestSidecars(t *testing.T) {
VolumeMounts: mounts,
})

// securityContext sidecar
assert.Contains(t, s.Spec.Template.Spec.Containers, v1.Container{
Name: "security-context-sidecar",
Env: env,
Resources: generateKubernetesResources("200m", "500m", "0.7Gi", "1.3Gi"),
ImagePullPolicy: v1.PullIfNotPresent,
VolumeMounts: mounts,
SecurityContext: &v1.SecurityContext{AllowPrivilegeEscalation: &trueValue},
})

}

func TestGeneratePodDisruptionBudget(t *testing.T) {
Expand Down