Skip to content

fix(ImageUpdater): GITOPS-11648 zombie Git processes when the operator starts /manager as PID 1 #1352

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
chengfang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ImageUpdater): GITOPS-11648 zombie Git processes when the operator starts /manager as PID 1 #1352

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
5 changes: 4 additions & 1 deletion argocd-operator/controllers/argocd/image_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,11 @@ func (r *ReconcileArgoCD) reconcileImageUpdaterDeployment(cr *argoproj.ArgoCD, s
imageUpdaterTLSProfileArguments := BuildTLSArgsFromClusterTLSProfile(r.CentralTLSConfigProfile)
args = append(args, imageUpdaterTLSProfileArguments...)

// Command is intentionally not set so that the image's own ENTRYPOINT applies.
// The image updater image runs the manager under tini ("tini -- /manager"), which
// reaps the git child processes the manager forks. Overriding Command with "/manager"
// would make the manager PID 1 and leak zombie git processes (GITOPS-11648).
podSpec.Containers = []corev1.Container{{
Command: []string{"/manager"},
Args: args,
Image: selectImageUpdaterImage(cr),
ImagePullPolicy: argoutil.GetImagePullPolicy(cr.Spec.ImagePullPolicy),
Expand Down
3 changes: 2 additions & 1 deletion argocd-operator/controllers/argocd/image_updater_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,9 @@ func TestReconcileImageUpdater_CreateDeployments(t *testing.T) {
// Ensure the created Deployment has the expected properties
assert.Equal(t, deployment.Spec.Template.Spec.ServiceAccountName, sa.Name)

// No Command is expected: the container must inherit the image ENTRYPOINT so that
// tini stays PID 1 and reaps git child processes (GITOPS-11648).
want := []v1.Container{{
Command: []string{"/manager"},
Args: []string{"run"},
Image: argoutil.CombineImageTag(DefaultImageUpdaterImage, DefaultImageUpdaterTag),
ImagePullPolicy: v1.PullIfNotPresent,
Expand Down
Loading