Merge pull request #458 from iam-veeramalla/fixKamUpgrade

fix: handle kam security context during upgrades
redhat-developer · Mar 10, 2023 · 8b7bcab · 8b7bcab
2 parents 02ce269 + 1bbc130
commit 8b7bcab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/controllers/gitopsservice_controller.go b/controllers/gitopsservice_controller.go
@@ -621,6 +621,10 @@ func (r *ReconcileGitopsService) reconcileBackend(gitopsserviceNamespacedName ty
 				found.Spec.Template.Spec.Tolerations = deploymentObj.Spec.Template.Spec.Tolerations
 				changed = true
 			}
+			if !reflect.DeepEqual(found.Spec.Template.Spec.SecurityContext, deploymentObj.Spec.Template.Spec.SecurityContext) {
+				found.Spec.Template.Spec.SecurityContext = deploymentObj.Spec.Template.Spec.SecurityContext
+				changed = true
+			}
 
 			if changed {
 				reqLogger.Info("Reconciling existing backend Deployment", "Namespace", deploymentObj.Namespace, "Name", deploymentObj.Name)

diff --git a/controllers/kam.go b/controllers/kam.go
@@ -241,6 +241,10 @@ func (r *ReconcileGitopsService) reconcileCLIServer(cr *pipelinesv1alpha1.Gitops
 			existingDeployment.Spec.Template.Spec.Tolerations = deploymentObj.Spec.Template.Spec.Tolerations
 			changed = true
 		}
+		if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.SecurityContext, deploymentObj.Spec.Template.Spec.SecurityContext) {
+			existingDeployment.Spec.Template.Spec.SecurityContext = deploymentObj.Spec.Template.Spec.SecurityContext
+			changed = true
+		}
 
 		if changed {
 			err = r.Client.Update(context.TODO(), existingDeployment)