Skip to content

POC to add security context values #75

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

Draft
rpothier wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

POC to add security context values #75

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
2 changes: 2 additions & 0 deletions pkg/inject/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const (
annotationStatusKey = "conjur.org/status"
annotationContainerImageKey = "conjur.org/container-image"
annotationSecretsDestinationKey = "conjur.org/secrets-destination"
annotationRunAsUser = "conjur.org/run-as-user"
)
// These annotations are only used for sidecar injector and not passed on to the
// injected container
Expand All @@ -26,4 +27,5 @@ var sidecarInjectorAnnot = []string {
annotationSecretlessConfigKey,
annotationSecretlessCRDSuffixKey,
annotationContainerImageKey,
annotationRunAsUser,
}
8 changes: 8 additions & 0 deletions pkg/inject/secrets-provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ package inject
import (
corev1 "k8s.io/api/core/v1"
"os"
"strconv"
)

type SecretsProviderSidecarConfig struct {
containerMode string
containerName string
sidecarImage string
secretsDestination string
runAsUser string
}

var conjurEnvVars = []string{
Expand Down Expand Up @@ -77,10 +79,16 @@ func generateSecretsProviderSidecarConfig(
}
volumeMounts = append(volumeMounts, volumeMount)
}
userID, err := strconv.ParseInt(cfg.runAsUser, 10, 64)
if err != nil {
userID = 777
}

container := corev1.Container{
Name: cfg.containerName,
Image: cfg.sidecarImage,
ImagePullPolicy: "Always",
SecurityContext: &corev1.SecurityContext{RunAsUser: &userID},
VolumeMounts: volumeMounts,
Env: []corev1.EnvVar{
envVarFromFieldPath(
Expand Down
5 changes: 5 additions & 0 deletions pkg/inject/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,17 @@ func HandleAdmissionRequest(
&pod.ObjectMeta,
annotationSecretsDestinationKey,
)
runAsUser, err := getAnnotation(
&pod.ObjectMeta,
annotationRunAsUser,
)
sidecarConfig = generateSecretsProviderSidecarConfig(
SecretsProviderSidecarConfig{
containerMode: containerMode,
containerName: containerName,
sidecarImage: containerImage,
secretsDestination: secretsDestination,
runAsUser: runAsUser,
},
)
containerVolumeMounts := ContainerVolumeMounts{}
Expand Down
3 changes: 3 additions & 0 deletions pkg/inject/testdata/secrets-provider-init-mutated-pod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
"image": "secrets-provider-image",
"resources": {},
"imagePullPolicy": "Always",
"securityContext": {
"runAsUser": 1234
},
"env": [
{
"name": "MY_POD_NAME",
Expand Down
3 changes: 3 additions & 0 deletions pkg/inject/testdata/secrets-provider-mutated-pod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
"image": "secrets-provider-image",
"resources": {},
"imagePullPolicy": "Always",
"securityContext": {
"runAsUser": 1234
},
"env": [
{
"name": "MY_POD_NAME",
Expand Down