Skip to content

Commit dfdd7f8

Browse files
feat: added SecurityContext checks to all the components (#1886)
* GITOPS-7724: added SecurityContext checks to all the components Signed-off-by: Alka Kumari <[email protected]> * resolve lint error Signed-off-by: Alka Kumari <[email protected]> --------- Signed-off-by: Alka Kumari <[email protected]>
1 parent ef71979 commit dfdd7f8

File tree

4 files changed

+34
-0
lines changed

4 files changed

+34
-0
lines changed

controllers/argocd/deployment.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,14 @@ func (r *ReconcileArgoCD) reconcileServerDeployment(cr *argoproj.ArgoCD, useTLSF
11881188
explanation += "container security context"
11891189
changed = true
11901190
}
1191+
if !reflect.DeepEqual(deploy.Spec.Template.Spec.SecurityContext, existing.Spec.Template.Spec.SecurityContext) {
1192+
existing.Spec.Template.Spec.SecurityContext = deploy.Spec.Template.Spec.SecurityContext
1193+
if changed {
1194+
explanation += ", "
1195+
}
1196+
explanation += "pod security context"
1197+
changed = true
1198+
}
11911199
if !reflect.DeepEqual(deploy.Spec.Template.Spec.Containers[1:],
11921200
existing.Spec.Template.Spec.Containers[1:]) {
11931201
existing.Spec.Template.Spec.Containers = append(existing.Spec.Template.Spec.Containers[0:1],

controllers/argocd/dex.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,15 @@ func (r *ReconcileArgoCD) reconcileDexDeployment(cr *argoproj.ArgoCD) error {
426426
explanation += "container security context"
427427
changed = true
428428
}
429+
430+
if !reflect.DeepEqual(deploy.Spec.Template.Spec.SecurityContext, existing.Spec.Template.Spec.SecurityContext) {
431+
existing.Spec.Template.Spec.SecurityContext = deploy.Spec.Template.Spec.SecurityContext
432+
if changed {
433+
explanation += ", "
434+
}
435+
explanation += "pod security context"
436+
changed = true
437+
}
429438
if !reflect.DeepEqual(deploy.Spec.Template.Spec.Containers[0].VolumeMounts, existing.Spec.Template.Spec.Containers[0].VolumeMounts) {
430439
existing.Spec.Template.Spec.Containers[0].VolumeMounts = deploy.Spec.Template.Spec.Containers[0].VolumeMounts
431440
if changed {

controllers/argocd/notifications.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,15 @@ func (r *ReconcileArgoCD) reconcileNotificationsDeployment(cr *argoproj.ArgoCD,
506506
deploymentChanged = true
507507
}
508508

509+
if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.SecurityContext, desiredDeployment.Spec.Template.Spec.SecurityContext) {
510+
existingDeployment.Spec.Template.Spec.SecurityContext = desiredDeployment.Spec.Template.Spec.SecurityContext
511+
if deploymentChanged {
512+
explanation += ", "
513+
}
514+
explanation += "pod security context"
515+
deploymentChanged = true
516+
}
517+
509518
if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.ServiceAccountName, desiredDeployment.Spec.Template.Spec.ServiceAccountName) {
510519
existingDeployment.Spec.Template.Spec.ServiceAccountName = desiredDeployment.Spec.Template.Spec.ServiceAccountName
511520
if deploymentChanged {

controllers/argocd/repo_server.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,14 @@ func (r *ReconcileArgoCD) reconcileRepoDeployment(cr *argocdoperatorv1beta1.Argo
450450
explanation += "container security context"
451451
changed = true
452452
}
453+
if !reflect.DeepEqual(deploy.Spec.Template.Spec.SecurityContext, existing.Spec.Template.Spec.SecurityContext) {
454+
existing.Spec.Template.Spec.SecurityContext = deploy.Spec.Template.Spec.SecurityContext
455+
if changed {
456+
explanation += ", "
457+
}
458+
explanation += "pod security context"
459+
changed = true
460+
}
453461
if !reflect.DeepEqual(deploy.Spec.Template.Spec.Containers[1:],
454462
existing.Spec.Template.Spec.Containers[1:]) {
455463
existing.Spec.Template.Spec.Containers = append(existing.Spec.Template.Spec.Containers[0:1],

0 commit comments

Comments
 (0)