From 77d6e665bed534e5195d46cf5d8e24f5f3999dce Mon Sep 17 00:00:00 2001 From: chaunceyjiang Date: Thu, 11 May 2023 18:54:16 +0800 Subject: [PATCH] fix: add federatedresourcequota validate config Signed-off-by: chaunceyjiang --- .../templates/_karmada_webhook_configuration.tpl | 14 ++++++++++++++ .../webhookconfiguration/mainfests.go | 14 ++++++++++++++ .../cmdinit/karmada/webhook_configuration.go | 14 ++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/charts/karmada/templates/_karmada_webhook_configuration.tpl b/charts/karmada/templates/_karmada_webhook_configuration.tpl index 4f8b0709f..4900e57a4 100644 --- a/charts/karmada/templates/_karmada_webhook_configuration.tpl +++ b/charts/karmada/templates/_karmada_webhook_configuration.tpl @@ -157,4 +157,18 @@ webhooks: sideEffects: None admissionReviewVersions: ["v1"] timeoutSeconds: 3 + - name: federatedresourcequota.karmada.io + rules: + - operations: ["CREATE", "UPDATE"] + apiGroups: ["policy.karmada.io"] + apiVersions: ["*"] + resources: ["federatedresourcequotas"] + scope: "Namespaced" + clientConfig: + url: https://{{ $name }}-webhook.{{ $namespace }}.svc:443/validate-federatedresourcequota + {{- include "karmada.webhook.caBundle" . | nindent 6 }} + failurePolicy: Fail + sideEffects: None + admissionReviewVersions: [ "v1" ] + timeoutSeconds: 3 {{- end -}} diff --git a/operator/pkg/karmadaresource/webhookconfiguration/mainfests.go b/operator/pkg/karmadaresource/webhookconfiguration/mainfests.go index b427bf79a..3aedaf481 100644 --- a/operator/pkg/karmadaresource/webhookconfiguration/mainfests.go +++ b/operator/pkg/karmadaresource/webhookconfiguration/mainfests.go @@ -161,5 +161,19 @@ webhooks: sideEffects: None admissionReviewVersions: ["v1"] timeoutSeconds: 3 + - name: federatedresourcequota.karmada.io + rules: + - operations: ["CREATE", "UPDATE"] + apiGroups: ["policy.karmada.io"] + apiVersions: ["*"] + resources: ["federatedresourcequotas"] + scope: "Namespaced" + clientConfig: + url: https://{{ .Service }}.{{ .Namespace }}.svc:443/validate-federatedresourcequota + caBundle: {{ .CaBundle }} + failurePolicy: Fail + sideEffects: None + admissionReviewVersions: [ "v1" ] + timeoutSeconds: 3 ` ) diff --git a/pkg/karmadactl/cmdinit/karmada/webhook_configuration.go b/pkg/karmadactl/cmdinit/karmada/webhook_configuration.go index 1dccd7dd8..f637adc54 100644 --- a/pkg/karmadactl/cmdinit/karmada/webhook_configuration.go +++ b/pkg/karmadactl/cmdinit/karmada/webhook_configuration.go @@ -172,6 +172,20 @@ webhooks: sideEffects: None admissionReviewVersions: ["v1"] timeoutSeconds: 3 + - name: federatedresourcequota.karmada.io + rules: + - operations: ["CREATE", "UPDATE"] + apiGroups: ["policy.karmada.io"] + apiVersions: ["*"] + resources: ["federatedresourcequotas"] + scope: "Namespaced" + clientConfig: + url: https://karmada-webhook.%[1]s.svc:443/validate-federatedresourcequota + caBundle: %[2]s + failurePolicy: Fail + sideEffects: None + admissionReviewVersions: [ "v1" ] + timeoutSeconds: 3 `, systemNamespace, caBundle) }