diff --git a/docs/operator-manual/health.md b/docs/operator-manual/health.md index fcc4e34730..2129dfa8e1 100644 --- a/docs/operator-manual/health.md +++ b/docs/operator-manual/health.md @@ -36,21 +36,19 @@ metadata: app.kubernetes.io/name: argocd-cm app.kubernetes.io/part-of: argocd data: - resource.customizations: | - argoproj.io/Application: - health.lua: | - hs = {} - hs.status = "Progressing" - hs.message = "" - if obj.status ~= nil then - if obj.status.health ~= nil then - hs.status = obj.status.health.status - if obj.status.health.message ~= nil then - hs.message = obj.status.health.message - end - end + resource.customizations.health.argoproj.io_Application: | + hs = {} + hs.status = "Progressing" + hs.message = "" + if obj.status ~= nil then + if obj.status.health ~= nil then + hs.status = obj.status.health.status + if obj.status.health.message ~= nil then + hs.message = obj.status.health.message end - return hs + end + end + return hs ``` ## Custom Health Checks diff --git a/docs/user-guide/diffing.md b/docs/user-guide/diffing.md index e5c3620dec..4e650131d5 100644 --- a/docs/user-guide/diffing.md +++ b/docs/user-guide/diffing.md @@ -61,11 +61,9 @@ of a `MutatingWebhookConfiguration` webhooks: ```yaml data: - resource.customizations: | - admissionregistration.k8s.io/MutatingWebhookConfiguration: - ignoreDifferences: | - jqPathExpressions: - - '.webhooks[]?.clientConfig.caBundle' + resource.customizations.ignoreDifferences.admissionregistration.k8s.io_MutatingWebhookConfiguration: | + jqPathExpressions: + - '.webhooks[]?.clientConfig.caBundle' ``` The `status` field of `CustomResourceDefinitions` is often stored in Git/Helm manifest and should be ignored during diffing. The `ignoreResourceStatusField` setting simplifies @@ -119,11 +117,9 @@ metadata: app.kubernetes.io/name: argocd-cm app.kubernetes.io/part-of: argocd data: - resource.customizations: | - argoproj.io/Rollout: - knownTypeFields: - - field: spec.template.spec - type: core/v1/PodSpec + resource.customizations.knownTypeFields.argoproj.io_Rollout: | + - field: spec.template.spec + type: core/v1/PodSpec ``` The list of supported Kubernetes types is available in [diffing_known_types.txt](https://raw.githubusercontent.com/argoproj/argo-cd/master/util/argo/normalizers/diffing_known_types.txt)