Skip to content
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

Jump to bottom

feat: add securityContext for exporter, initcontainers and sidecars #987

Merged
merged 6 commits into from
Jun 15, 2024
Merged

feat: add securityContext for exporter, initcontainers and sidecars #987

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd20423
feat: add securityContext for exporter, initcontainers and sidecars
laurentiusoica Jun 14, 2024
6acb544
fix: add docs
laurentiusoica Jun 14, 2024
fe1aa43
fix: RedisExporterSecurityContext instead of SecurityContext
laurentiusoica Jun 14, 2024
48e30c3
fix: code review
laurentiusoica Jun 14, 2024
6fd9765
fix: refresh crds
laurentiusoica Jun 15, 2024
70e65f7
fix: refresh crds
laurentiusoica Jun 15, 2024
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
11 changes: 7 additions & 4 deletions api/v1beta2/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ type ClusterStorage struct {
// RedisExporter interface will have the information for redis exporter related stuff
type RedisExporter struct {
common.RedisExporter `json:",inline"`
SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`
lsoica marked this conversation as resolved.
Show resolved Hide resolved
}

// TLS Configuration for redis instances
Expand All @@ -73,10 +74,11 @@ type ACLConfig struct {

// Sidecar for each Redis pods
type Sidecar struct {
common.Sidecar `json:",inline"`
Volumes *[]corev1.VolumeMount `json:"mountPath,omitempty"`
Command []string `json:"command,omitempty" protobuf:"bytes,3,rep,name=command"`
Ports *[]corev1.ContainerPort `json:"ports,omitempty" patchStrategy:"merge" patchMergeKey:"containerPort" protobuf:"bytes,6,rep,name=ports"`
common.Sidecar `json:",inline"`
Volumes *[]corev1.VolumeMount `json:"mountPath,omitempty"`
Command []string `json:"command,omitempty" protobuf:"bytes,3,rep,name=command"`
Ports *[]corev1.ContainerPort `json:"ports,omitempty" patchStrategy:"merge" patchMergeKey:"containerPort" protobuf:"bytes,6,rep,name=ports"`
SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`
}

// InitContainer for each Redis pods
Expand All @@ -88,4 +90,5 @@ type InitContainer struct {
EnvVars *[]corev1.EnvVar `json:"env,omitempty"`
Command []string `json:"command,omitempty"`
Args []string `json:"args,omitempty"`
SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`
}
15 changes: 15 additions & 0 deletions api/v1beta2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,041 changes: 2,695 additions & 346 deletions charts/redis-operator/crds/redis-cluster.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,910 changes: 1,724 additions & 186 deletions charts/redis-operator/crds/redis-replication.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,581 changes: 1,495 additions & 86 deletions charts/redis-operator/crds/redis-sentinel.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,905 changes: 1,718 additions & 187 deletions charts/redis-operator/crds/redis.yaml
View file
Open in desktop

Large diffs are not rendered by default.

510 changes: 510 additions & 0 deletions config/crd/bases/redis.redis.opstreelabs.in_redis.yaml
View file
Open in desktop

Large diffs are not rendered by default.

510 changes: 510 additions & 0 deletions config/crd/bases/redis.redis.opstreelabs.in_redisclusters.yaml
View file
Open in desktop

Large diffs are not rendered by default.

510 changes: 510 additions & 0 deletions config/crd/bases/redis.redis.opstreelabs.in_redisreplications.yaml
View file
Open in desktop

Large diffs are not rendered by default.

510 changes: 510 additions & 0 deletions config/crd/bases/redis.redis.opstreelabs.in_redissentinels.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/content/en/docs/CRD Reference/Redis API/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ _Appears in:_
| `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#resourcerequirements-v1-core)_ | |
| `imagePullPolicy` _[ImagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy)_ | |
| `env` _[EnvVar](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#envvar-v1-core)_ | |
| `securityContext` _[PodSecurityContext](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#podsecuritycontext-v1-core)_ | |

#### RedisFollower

Expand Down Expand Up @@ -323,6 +324,7 @@ _Appears in:_
| `imagePullPolicy` _[ImagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy)_ | |
| `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#resourcerequirements-v1-core)_ | |
| `env` _[EnvVar](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#envvar-v1-core)_ | |
| `securityContext` _[PodSecurityContext](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#podsecuritycontext-v1-core)_ | |

#### Storage

Expand Down
2 changes: 2 additions & 0 deletions k8sutils/redis-cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ func generateRedisClusterInitContainerParams(cr *redisv1beta2.RedisCluster) init
AdditionalEnvVariable: initContainer.EnvVars,
Command: initContainer.Command,
Arguments: initContainer.Args,
SecurityContext: initContainer.SecurityContext,
}

if cr.Spec.Storage != nil {
Expand Down Expand Up @@ -171,6 +172,7 @@ func generateRedisClusterContainerParams(cl kubernetes.Interface, logger logr.Lo
if cr.Spec.RedisExporter != nil {
containerProp.RedisExporterImage = cr.Spec.RedisExporter.Image
containerProp.RedisExporterImagePullPolicy = cr.Spec.RedisExporter.ImagePullPolicy
containerProp.RedisExporterSecurityContext = cr.Spec.RedisExporter.SecurityContext

if cr.Spec.RedisExporter.Resources != nil {
containerProp.RedisExporterResources = cr.Spec.RedisExporter.Resources
Expand Down
2 changes: 2 additions & 0 deletions k8sutils/redis-replication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ func generateRedisReplicationContainerParams(cr *redisv1beta2.RedisReplication)
if cr.Spec.RedisExporter != nil {
containerProp.RedisExporterImage = cr.Spec.RedisExporter.Image
containerProp.RedisExporterImagePullPolicy = cr.Spec.RedisExporter.ImagePullPolicy
containerProp.RedisExporterSecurityContext = cr.Spec.RedisExporter.SecurityContext

if cr.Spec.RedisExporter.Resources != nil {
containerProp.RedisExporterResources = cr.Spec.RedisExporter.Resources
Expand Down Expand Up @@ -188,6 +189,7 @@ func generateRedisReplicationInitContainerParams(cr *redisv1beta2.RedisReplicati
AdditionalEnvVariable: initContainer.EnvVars,
Command: initContainer.Command,
Arguments: initContainer.Args,
SecurityContext: initContainer.SecurityContext,
}

if cr.Spec.Storage != nil {
Expand Down
2 changes: 2 additions & 0 deletions k8sutils/redis-sentinel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ func generateRedisSentinelInitContainerParams(cr *redisv1beta2.RedisSentinel) in
AdditionalEnvVariable: initContainer.EnvVars,
Command: initContainer.Command,
Arguments: initContainer.Args,
SecurityContext: initContainer.SecurityContext,
}
}
return initcontainerProp
Expand Down Expand Up @@ -162,6 +163,7 @@ func generateRedisSentinelContainerParams(ctx context.Context, client kubernetes
if cr.Spec.RedisExporter != nil {
containerProp.RedisExporterImage = cr.Spec.RedisExporter.Image
containerProp.RedisExporterImagePullPolicy = cr.Spec.RedisExporter.ImagePullPolicy
containerProp.RedisExporterSecurityContext = cr.Spec.RedisExporter.SecurityContext

if cr.Spec.RedisExporter.Resources != nil {
containerProp.RedisExporterResources = cr.Spec.RedisExporter.Resources
Expand Down
2 changes: 2 additions & 0 deletions k8sutils/redis-standalone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ func generateRedisStandaloneContainerParams(cr *redisv1beta2.Redis) containerPar
if cr.Spec.RedisExporter.EnvVars != nil {
containerProp.RedisExporterEnv = cr.Spec.RedisExporter.EnvVars
}
containerProp.RedisExporterSecurityContext = cr.Spec.RedisExporter.SecurityContext
}
if cr.Spec.ReadinessProbe != nil {
containerProp.ReadinessProbe = cr.Spec.ReadinessProbe
Expand Down Expand Up @@ -186,6 +187,7 @@ func generateRedisStandaloneInitContainerParams(cr *redisv1beta2.Redis) initCont
AdditionalEnvVariable: initContainer.EnvVars,
Command: initContainer.Command,
Arguments: initContainer.Args,
SecurityContext: initContainer.SecurityContext,
}

if cr.Spec.Storage != nil {
Expand Down
5 changes: 5 additions & 0 deletions k8sutils/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ type containerParameters struct {
RedisExporterResources *corev1.ResourceRequirements
RedisExporterEnv *[]corev1.EnvVar
RedisExporterPort *int
RedisExporterSecurityContext *corev1.SecurityContext
Role string
EnabledPassword *bool
SecretName *string
Expand Down Expand Up @@ -145,6 +146,7 @@ type initContainerParameters struct {
AdditionalEnvVariable *[]corev1.EnvVar
AdditionalVolume []corev1.Volume
AdditionalMountPath []corev1.VolumeMount
SecurityContext *corev1.SecurityContext
}

// CreateOrUpdateStateFul method will create or update Redis service
Expand Down Expand Up @@ -436,6 +438,7 @@ func generateContainerDef(name string, containerParams containerParameters, clus
Name: sidecar.Name,
Image: sidecar.Image,
ImagePullPolicy: sidecar.ImagePullPolicy,
SecurityContext: sidecar.SecurityContext,
}
if sidecar.Command != nil {
container.Command = sidecar.Command
Expand Down Expand Up @@ -471,6 +474,7 @@ func generateInitContainerDef(name string, initcontainerParams initContainerPara
Command: initcontainerParams.Command,
Args: initcontainerParams.Arguments,
VolumeMounts: getVolumeMount(name, initcontainerParams.PersistenceEnabled, false, false, nil, mountpath, nil, nil),
SecurityContext: initcontainerParams.SecurityContext,
},
}

Expand Down Expand Up @@ -538,6 +542,7 @@ func enableRedisMonitoring(params containerParameters) corev1.Container {
Protocol: corev1.ProtocolTCP,
},
},
SecurityContext: params.RedisExporterSecurityContext,
}
if params.RedisExporterResources != nil {
exporterDefinition.Resources = *params.RedisExporterResources
Expand Down
Loading