Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions component/app.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ local app = argocd.App('argocd', params.namespace, secrets=false) {
syncPolicy+: {
syncOptions+: [
'ServerSideApply=true',
'SkipDryRunOnMissingResource=true',
],
automated+: {
[if params.operator.migrate then 'prune' else null]: false,
Expand Down
7 changes: 7 additions & 0 deletions component/argocd-priority-class.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ local hasEspejote = std.member(inv.applications, 'espejote');
if hasEspejote then
{
'10_argocd_priority_class': esp.admission('argocd-set-priority-class', params.namespace) {
metadata+: {
annotations: {
// We set a higher sync-wave than the syn ArgoCD instance to ensure
// bootstrap is not blocked my missing espejote CRDs
'argocd.argoproj.io/sync-wave': '20',
},
},
spec: {
mutating: true,
template: importstr 'espejote-templates/argocd-priority-class.jsonnet',
Expand Down
1 change: 1 addition & 0 deletions tests/golden/defaults/argocd/apps/10_argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ spec:
selfHeal: true
syncOptions:
- ServerSideApply=true
- SkipDryRunOnMissingResource=true
1 change: 1 addition & 0 deletions tests/golden/https-catalog/argocd/apps/10_argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ spec:
selfHeal: true
syncOptions:
- ServerSideApply=true
- SkipDryRunOnMissingResource=true
1 change: 1 addition & 0 deletions tests/golden/openshift/argocd/apps/10_argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ spec:
selfHeal: true
syncOptions:
- ServerSideApply=true
- SkipDryRunOnMissingResource=true
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: espejote.io/v1alpha1
kind: Admission
metadata:
annotations:
argocd.argoproj.io/sync-wave: '20'
labels:
app.kubernetes.io/name: argocd-set-priority-class
name: argocd-set-priority-class
Expand Down
1 change: 1 addition & 0 deletions tests/golden/params/argocd/apps/10_argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ spec:
selfHeal: true
syncOptions:
- ServerSideApply=true
- SkipDryRunOnMissingResource=true
1 change: 1 addition & 0 deletions tests/golden/prometheus/argocd/apps/10_argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ spec:
selfHeal: true
syncOptions:
- ServerSideApply=true
- SkipDryRunOnMissingResource=true
1 change: 1 addition & 0 deletions tests/golden/syn-teams/argocd/apps/10_argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ spec:
selfHeal: true
syncOptions:
- ServerSideApply=true
- SkipDryRunOnMissingResource=true
Loading