Skip to content

Commit c76c31b

Browse files
authored
feat: fix argocd out of sync issues (#1711)
1 parent 00a9d35 commit c76c31b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/cmd/apply-as-apps.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,9 @@ const getArgocdAppManifest = (release: HelmRelease, values: Record<string, any>,
5252
'otomi.io/app': 'managed',
5353
},
5454
namespace: 'argocd',
55-
annotations: ['tempo', 'thanos'].includes(release.name)
56-
? {
57-
'argocd.argoproj.io/compare-options': 'ServerSideDiff=true,IncludeMutationWebhook=true',
58-
}
59-
: {},
55+
annotations: {
56+
'argocd.argoproj.io/compare-options': 'ServerSideDiff=true,IncludeMutationWebhook=true',
57+
},
6058
},
6159
spec: {
6260
syncPolicy: {

values/argocd/argocd.gotmpl

+3
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ configs:
9797
resource.customizations.knownTypeFields.cert-manager.io_Certificate: |
9898
- field: spec.duration
9999
type: meta/v1/Duration
100+
resource.customizations.ignoreDifferences.apiextensions.k8s.io_CustomResourceDefinition: |
101+
jqPathExpressions:
102+
- '.metadata.annotations'
100103
oidc.config: |
101104
name: Otomi
102105
issuer: {{ $v._derived.oidcBaseUrl }}

0 commit comments

Comments
 (0)