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

Fix finalizer deadlock in ArgoCD #3447

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix finalizer deadlock in ArgoCD #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
978eae5
add argocd annotations to get around finalizer deadlock
rteeling-evernorth Apr 16, 2024
2fe92db
Merge branch 'master' into rt/argo-deadlock-fix
rteeling-evernorth May 16, 2024
33ecd87
Merge branch 'master' into rt/argo-deadlock-fix
rteeling-evernorth May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ metadata:
{{- if and (ne $containerMode.type "kubernetes") (not .Values.template.spec.serviceAccountName) }}
actions.github.com/cleanup-no-permission-service-account-name: {{ include "gha-runner-scale-set.noPermissionServiceAccountName" . }}
{{- end }}
argocd.argoproj.io/sync-wave: "1"
rteeling-evernorth marked this conversation as resolved.
Show resolved Hide resolved
spec:
githubConfigUrl: {{ required ".Values.githubConfigUrl is required" (trimSuffix "/" .Values.githubConfigUrl) }}
githubConfigSecret: {{ include "gha-runner-scale-set.githubsecret" . }}
Expand Down
2 changes: 2 additions & 0 deletions charts/gha-runner-scale-set/templates/kube_mode_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ kind: Role
metadata:
name: {{ include "gha-runner-scale-set.kubeModeRoleName" . }}
namespace: {{ .Release.Namespace }}
annotations:
argocd.argoproj.io/sync-options: Delete=false
finalizers:
- actions.github.com/cleanup-protection
rules:
Expand Down
2 changes: 2 additions & 0 deletions charts/gha-runner-scale-set/templates/kube_mode_role_binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ kind: RoleBinding
metadata:
name: {{ include "gha-runner-scale-set.kubeModeRoleBindingName" . }}
namespace: {{ .Release.Namespace }}
annotations:
argocd.argoproj.io/sync-options: Delete=false
finalizers:
- actions.github.com/cleanup-protection
roleRef:
Expand Down
3 changes: 3 additions & 0 deletions charts/gha-runner-scale-set/templates/kube_mode_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ metadata:
{{- with .Values.containerMode.kubernetesModeServiceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
argocd.argoproj.io/sync-options: Delete=false
{{- end }}
annotations:
argocd.argoproj.io/sync-options: Delete=false
{{- end }}
finalizers:
- actions.github.com/cleanup-protection
Expand Down
2 changes: 2 additions & 0 deletions charts/gha-runner-scale-set/templates/manager_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: Role
metadata:
name: {{ include "gha-runner-scale-set.managerRoleName" . }}
namespace: {{ .Release.Namespace }}
annotations:
argocd.argoproj.io/sync-options: Delete=false
labels:
{{- include "gha-runner-scale-set.labels" . | nindent 4 }}
app.kubernetes.io/component: manager-role
Expand Down
2 changes: 2 additions & 0 deletions charts/gha-runner-scale-set/templates/manager_role_binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: RoleBinding
metadata:
name: {{ include "gha-runner-scale-set.managerRoleBindingName" . }}
namespace: {{ .Release.Namespace }}
annotations:
argocd.argoproj.io/sync-options: Delete=false
labels:
{{- include "gha-runner-scale-set.labels" . | nindent 4 }}
app.kubernetes.io/component: manager-role-binding
Expand Down
2 changes: 2 additions & 0 deletions charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ kind: ServiceAccount
metadata:
name: {{ include "gha-runner-scale-set.noPermissionServiceAccountName" . }}
namespace: {{ .Release.Namespace }}
annotations:
argocd.argoproj.io/sync-options: Delete=false
labels:
{{- include "gha-runner-scale-set.labels" . | nindent 4 }}
finalizers:
Expand Down