diff --git a/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml b/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml index 39ebfef800..0f7877825f 100644 --- a/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml +++ b/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml @@ -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" spec: githubConfigUrl: {{ required ".Values.githubConfigUrl is required" (trimSuffix "/" .Values.githubConfigUrl) }} githubConfigSecret: {{ include "gha-runner-scale-set.githubsecret" . }} diff --git a/charts/gha-runner-scale-set/templates/kube_mode_role.yaml b/charts/gha-runner-scale-set/templates/kube_mode_role.yaml index e82d7b7713..895539657f 100644 --- a/charts/gha-runner-scale-set/templates/kube_mode_role.yaml +++ b/charts/gha-runner-scale-set/templates/kube_mode_role.yaml @@ -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: diff --git a/charts/gha-runner-scale-set/templates/kube_mode_role_binding.yaml b/charts/gha-runner-scale-set/templates/kube_mode_role_binding.yaml index 060b9399e5..e56ec6edd0 100644 --- a/charts/gha-runner-scale-set/templates/kube_mode_role_binding.yaml +++ b/charts/gha-runner-scale-set/templates/kube_mode_role_binding.yaml @@ -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: diff --git a/charts/gha-runner-scale-set/templates/kube_mode_serviceaccount.yaml b/charts/gha-runner-scale-set/templates/kube_mode_serviceaccount.yaml index d0fa4b085c..bfaee9db17 100644 --- a/charts/gha-runner-scale-set/templates/kube_mode_serviceaccount.yaml +++ b/charts/gha-runner-scale-set/templates/kube_mode_serviceaccount.yaml @@ -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 diff --git a/charts/gha-runner-scale-set/templates/manager_role.yaml b/charts/gha-runner-scale-set/templates/manager_role.yaml index f6a1e49383..254d0cbe86 100644 --- a/charts/gha-runner-scale-set/templates/manager_role.yaml +++ b/charts/gha-runner-scale-set/templates/manager_role.yaml @@ -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 diff --git a/charts/gha-runner-scale-set/templates/manager_role_binding.yaml b/charts/gha-runner-scale-set/templates/manager_role_binding.yaml index ce212f77e2..eb0d521ac1 100644 --- a/charts/gha-runner-scale-set/templates/manager_role_binding.yaml +++ b/charts/gha-runner-scale-set/templates/manager_role_binding.yaml @@ -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 diff --git a/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml b/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml index f7c9700f1a..05579f4050 100644 --- a/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml +++ b/charts/gha-runner-scale-set/templates/no_permission_serviceaccount.yaml @@ -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: