From f40be5f91ab38f1558a8956ab3e4d1603b15722a Mon Sep 17 00:00:00 2001 From: minchao Date: Mon, 18 Sep 2023 16:21:09 +0800 Subject: [PATCH] fix: replace deprecated syntax in kustomization.yaml Signed-off-by: minchao --- config/crd/kustomization.yaml | 10 +++++----- config/default/kustomization.yaml | 12 ++++++------ docs/install/manual.md | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index affcaaf1f..d64b76627 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -10,17 +10,17 @@ resources: #+kubebuilder:scaffold:crdkustomizeresource -patchesStrategicMerge: +patches: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD -- patches/webhook_in_argocds.yaml -#- patches/webhook_in_argocdexports.yaml +- path: patches/webhook_in_argocds.yaml +#- path: patches/webhook_in_argocdexports.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD -- patches/cainjection_in_argocds.yaml -#- patches/cainjection_in_argocdexports.yaml +- path: patches/cainjection_in_argocds.yaml +#- path: patches/cainjection_in_argocdexports.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch # the following config is for teaching kustomize how to do kustomization for CRDs. diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 89a72e9b2..2bd4e09fd 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -12,7 +12,7 @@ namePrefix: argocd-operator- #commonLabels: # someName: someValue -bases: +resources: - ../crd - ../rbac - ../manager @@ -24,24 +24,24 @@ bases: # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. # - ../prometheus -patchesStrategicMerge: +patches: # Protect the /metrics endpoint by putting it behind auth. # If you want your controller-manager to expose the /metrics # endpoint w/o any authn/z, please comment the following line. -# - manager_auth_proxy_patch.yaml +#- path: manager_auth_proxy_patch.yaml # Mount the controller config file for loading manager configurations # through a ComponentConfig type -#- manager_config_patch.yaml +#- path: manager_config_patch.yaml # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in # crd/kustomization.yaml -- manager_webhook_patch.yaml +- path: manager_webhook_patch.yaml # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks. # 'CERTMANAGER' needs to be enabled to use ca injection -#- webhookcainjection_patch.yaml +#- path: webhookcainjection_patch.yaml # the following config is for teaching kustomize how to do var substitution vars: diff --git a/docs/install/manual.md b/docs/install/manual.md index 79fb7cdc3..99a975c34 100644 --- a/docs/install/manual.md +++ b/docs/install/manual.md @@ -50,9 +50,9 @@ metadata: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) ``` -Enable `../certmanager` directory under the `bases` section in `config/default/kustomization.yaml` file. +Enable `../certmanager` directory under the `resources` section in `config/default/kustomization.yaml` file. ```yaml -bases: +resources: ..... - ../webhook # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.