From 44fff5583cbec1d6348d1090154947ca6997bfb4 Mon Sep 17 00:00:00 2001 From: Nacho Fuertes Date: Wed, 19 Feb 2025 15:49:24 +0100 Subject: [PATCH 1/3] Fine tune configuration for ArgoCD ignore Signed-off-by: Nacho Fuertes --- src/content/self-hosted/manage/argocd.mdx | 34 +++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/content/self-hosted/manage/argocd.mdx b/src/content/self-hosted/manage/argocd.mdx index 37577af83..4ca109e33 100644 --- a/src/content/self-hosted/manage/argocd.mdx +++ b/src/content/self-hosted/manage/argocd.mdx @@ -80,21 +80,27 @@ ignoreDifferences: - '/data/tls.crt' - '/data/tls.key' - # Webhook cabundles patched by Okteto - - group: 'admissionregistration.k8s.io' + # Mutation webhook cabundles patched by Okteto + - group: admissionregistration.k8s.io + kind: MutatingWebhookConfiguration + jqPathExpressions: + - .webhooks[].clientConfig.caBundle + + # Validation webhook cabundles patched by Okteto + - group: admissionregistration.k8s.io + kind: ValidatingWebhookConfiguration + jqPathExpressions: + - .webhooks[].clientConfig.caBundle + + # Internal service account managed by Okteto + - kind: ServiceAccount + name: okteto-bot jsonPointers: - - '/webhooks/0/clientConfig/caBundle' - - '/webhooks/1/clientConfig/caBundle' - - '/webhooks/2/clientConfig/caBundle' - - '/webhooks/3/clientConfig/caBundle' - - '/webhooks/4/clientConfig/caBundle' - - '/webhooks/5/clientConfig/caBundle' - - '/webhooks/6/clientConfig/caBundle' - - '/webhooks/7/clientConfig/caBundle' - - '/webhooks/8/clientConfig/caBundle' - - '/webhooks/9/clientConfig/caBundle' - - '/webhooks/10/clientConfig/caBundle' - - '/webhooks/11/clientConfig/caBundle' + - /metadata/labels/app + - /metadata/labels/app.kubernetes.io~1instance + - /metadata/labels/chart + - /metadata/labels/heritage + - /metadata/labels/release # Internal service account managed by Okteto - kind: 'ServiceAccount' From d4bd5849191a8f740e8a0dbdf15eb1d1a28fc431 Mon Sep 17 00:00:00 2001 From: Nacho Fuertes Date: Wed, 19 Feb 2025 16:00:49 +0100 Subject: [PATCH 2/3] Added changes to current version too Signed-off-by: Nacho Fuertes --- .../self-hosted/manage/argocd.mdx | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx b/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx index 37577af83..4ca109e33 100644 --- a/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx +++ b/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx @@ -80,21 +80,27 @@ ignoreDifferences: - '/data/tls.crt' - '/data/tls.key' - # Webhook cabundles patched by Okteto - - group: 'admissionregistration.k8s.io' + # Mutation webhook cabundles patched by Okteto + - group: admissionregistration.k8s.io + kind: MutatingWebhookConfiguration + jqPathExpressions: + - .webhooks[].clientConfig.caBundle + + # Validation webhook cabundles patched by Okteto + - group: admissionregistration.k8s.io + kind: ValidatingWebhookConfiguration + jqPathExpressions: + - .webhooks[].clientConfig.caBundle + + # Internal service account managed by Okteto + - kind: ServiceAccount + name: okteto-bot jsonPointers: - - '/webhooks/0/clientConfig/caBundle' - - '/webhooks/1/clientConfig/caBundle' - - '/webhooks/2/clientConfig/caBundle' - - '/webhooks/3/clientConfig/caBundle' - - '/webhooks/4/clientConfig/caBundle' - - '/webhooks/5/clientConfig/caBundle' - - '/webhooks/6/clientConfig/caBundle' - - '/webhooks/7/clientConfig/caBundle' - - '/webhooks/8/clientConfig/caBundle' - - '/webhooks/9/clientConfig/caBundle' - - '/webhooks/10/clientConfig/caBundle' - - '/webhooks/11/clientConfig/caBundle' + - /metadata/labels/app + - /metadata/labels/app.kubernetes.io~1instance + - /metadata/labels/chart + - /metadata/labels/heritage + - /metadata/labels/release # Internal service account managed by Okteto - kind: 'ServiceAccount' From 621d509ea090e161fa2485bcd3285198f073b2a9 Mon Sep 17 00:00:00 2001 From: Nacho Fuertes Date: Wed, 19 Feb 2025 19:44:19 +0100 Subject: [PATCH 3/3] Use single quote for the values as the rest of the configuration Signed-off-by: Nacho Fuertes --- src/content/self-hosted/manage/argocd.mdx | 26 +++++++++---------- .../self-hosted/manage/argocd.mdx | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/content/self-hosted/manage/argocd.mdx b/src/content/self-hosted/manage/argocd.mdx index 4ca109e33..8ec067951 100644 --- a/src/content/self-hosted/manage/argocd.mdx +++ b/src/content/self-hosted/manage/argocd.mdx @@ -81,26 +81,26 @@ ignoreDifferences: - '/data/tls.key' # Mutation webhook cabundles patched by Okteto - - group: admissionregistration.k8s.io - kind: MutatingWebhookConfiguration + - group: 'admissionregistration.k8s.io' + kind: 'MutatingWebhookConfiguration' jqPathExpressions: - - .webhooks[].clientConfig.caBundle + - '.webhooks[].clientConfig.caBundle' # Validation webhook cabundles patched by Okteto - - group: admissionregistration.k8s.io - kind: ValidatingWebhookConfiguration + - group: 'admissionregistration.k8s.io' + kind: 'ValidatingWebhookConfiguration' jqPathExpressions: - - .webhooks[].clientConfig.caBundle + - '.webhooks[].clientConfig.caBundle' # Internal service account managed by Okteto - - kind: ServiceAccount - name: okteto-bot + - kind: 'ServiceAccount' + name: 'okteto-bot' jsonPointers: - - /metadata/labels/app - - /metadata/labels/app.kubernetes.io~1instance - - /metadata/labels/chart - - /metadata/labels/heritage - - /metadata/labels/release + - '/metadata/labels/app' + - '/metadata/labels/app.kubernetes.io~1instance' + - '/metadata/labels/chart' + - '/metadata/labels/heritage' + - '/metadata/labels/release' # Internal service account managed by Okteto - kind: 'ServiceAccount' diff --git a/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx b/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx index 4ca109e33..8ec067951 100644 --- a/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx +++ b/versioned_docs/version-1.29/self-hosted/manage/argocd.mdx @@ -81,26 +81,26 @@ ignoreDifferences: - '/data/tls.key' # Mutation webhook cabundles patched by Okteto - - group: admissionregistration.k8s.io - kind: MutatingWebhookConfiguration + - group: 'admissionregistration.k8s.io' + kind: 'MutatingWebhookConfiguration' jqPathExpressions: - - .webhooks[].clientConfig.caBundle + - '.webhooks[].clientConfig.caBundle' # Validation webhook cabundles patched by Okteto - - group: admissionregistration.k8s.io - kind: ValidatingWebhookConfiguration + - group: 'admissionregistration.k8s.io' + kind: 'ValidatingWebhookConfiguration' jqPathExpressions: - - .webhooks[].clientConfig.caBundle + - '.webhooks[].clientConfig.caBundle' # Internal service account managed by Okteto - - kind: ServiceAccount - name: okteto-bot + - kind: 'ServiceAccount' + name: 'okteto-bot' jsonPointers: - - /metadata/labels/app - - /metadata/labels/app.kubernetes.io~1instance - - /metadata/labels/chart - - /metadata/labels/heritage - - /metadata/labels/release + - '/metadata/labels/app' + - '/metadata/labels/app.kubernetes.io~1instance' + - '/metadata/labels/chart' + - '/metadata/labels/heritage' + - '/metadata/labels/release' # Internal service account managed by Okteto - kind: 'ServiceAccount'