From d2b3a634ea68b21db28e7ea374945aefe23f1e84 Mon Sep 17 00:00:00 2001 From: "zhongjun.li" Date: Thu, 28 Oct 2021 09:55:56 +0800 Subject: [PATCH] clean_up Signed-off-by: zhongjun.li --- charts/_crds/patches/webhook_in_clusterresourcebindings.yaml | 3 +-- charts/_crds/patches/webhook_in_resourcebindings.yaml | 3 +-- charts/templates/_patch_webhook_in_clusterresourcebindings.tpl | 3 +-- charts/templates/_patch_webhook_in_resourcebindings.tpl | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/charts/_crds/patches/webhook_in_clusterresourcebindings.yaml b/charts/_crds/patches/webhook_in_clusterresourcebindings.yaml index 9dab7b131..b8570a6d0 100644 --- a/charts/_crds/patches/webhook_in_clusterresourcebindings.yaml +++ b/charts/_crds/patches/webhook_in_clusterresourcebindings.yaml @@ -11,5 +11,4 @@ spec: clientConfig: url: https://karmada-webhook.karmada-system.svc:443/convert caBundle: {{caBundle}} - # TODO(RainbowMango): After we update controller-runtime to v0.10+, then we can remove `v1beta1` - conversionReviewVersions: ["v1beta1", "v1"] + conversionReviewVersions: ["v1"] diff --git a/charts/_crds/patches/webhook_in_resourcebindings.yaml b/charts/_crds/patches/webhook_in_resourcebindings.yaml index 4b5c24e5d..c55bed0bf 100644 --- a/charts/_crds/patches/webhook_in_resourcebindings.yaml +++ b/charts/_crds/patches/webhook_in_resourcebindings.yaml @@ -11,5 +11,4 @@ spec: clientConfig: url: https://karmada-webhook.karmada-system.svc:443/convert caBundle: {{caBundle}} - # TODO(RainbowMango): After we update controller-runtime to v0.10+, then we can remove `v1beta1` - conversionReviewVersions: ["v1beta1", "v1"] + conversionReviewVersions: ["v1"] diff --git a/charts/templates/_patch_webhook_in_clusterresourcebindings.tpl b/charts/templates/_patch_webhook_in_clusterresourcebindings.tpl index 52b6e068f..269a28c09 100644 --- a/charts/templates/_patch_webhook_in_clusterresourcebindings.tpl +++ b/charts/templates/_patch_webhook_in_clusterresourcebindings.tpl @@ -15,7 +15,6 @@ spec: clientConfig: url: https://{{ $name }}-webhook.{{ $namespace }}.svc:443/convert {{- include "karmada.webhook.caBundle" . | nindent 8 }} - # TODO(RainbowMango): After we update controller-runtime to v0.10+, then we can remove `v1beta1` - conversionReviewVersions: ["v1beta1", "v1"] + conversionReviewVersions: ["v1"] --- {{- end -}} diff --git a/charts/templates/_patch_webhook_in_resourcebindings.tpl b/charts/templates/_patch_webhook_in_resourcebindings.tpl index 31801b5a9..107902ca2 100644 --- a/charts/templates/_patch_webhook_in_resourcebindings.tpl +++ b/charts/templates/_patch_webhook_in_resourcebindings.tpl @@ -15,7 +15,6 @@ spec: clientConfig: url: https://{{ $name }}-webhook.{{ $namespace }}.svc:443/convert {{- include "karmada.webhook.caBundle" . | nindent 8 }} - # TODO(RainbowMango): After we update controller-runtime to v0.10+, then we can remove `v1beta1` - conversionReviewVersions: ["v1beta1", "v1"] + conversionReviewVersions: ["v1"] --- {{- end -}}