From 2ea36db5d6a38cf15d777c2e34e4f9494ed0664b Mon Sep 17 00:00:00 2001 From: Erin Corson Date: Thu, 4 Mar 2021 00:24:11 -0700 Subject: [PATCH] fix(typo): fixing typo in several webhook error messages (#212) Co-authored-by: Erin Corson --- docs/operator/use-cases/create-namespaces.md | 2 +- docs/operator/use-cases/network-policies.md | 2 +- pkg/webhook/namespacequota/errors.go | 2 +- pkg/webhook/networkpolicies/validating.go | 4 ++-- pkg/webhook/ownerreference/patching.go | 2 +- pkg/webhook/tenantprefix/validating.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/operator/use-cases/create-namespaces.md b/docs/operator/use-cases/create-namespaces.md index d88c8b15..0d9fbc4d 100644 --- a/docs/operator/use-cases/create-namespaces.md +++ b/docs/operator/use-cases/create-namespaces.md @@ -90,7 +90,7 @@ Once the namespace quota assigned to the tenant has been reached, Alice cannot c ``` alice@caas# kubectl create ns oil-training -Error from server (Cannot exceed Namespace quota: please, reach out the system administrators): admission webhook "quota.namespace.capsule.clastix.io" denied the request. +Error from server (Cannot exceed Namespace quota: please, reach out to the system administrators): admission webhook "quota.namespace.capsule.clastix.io" denied the request. ``` The enforcement on the maximum number of Namespace resources per Tenant is the responsibility of the Capsule controller via its Dynamic Admission Webhook capability. diff --git a/docs/operator/use-cases/network-policies.md b/docs/operator/use-cases/network-policies.md index d06ca63e..a94586cf 100644 --- a/docs/operator/use-cases/network-policies.md +++ b/docs/operator/use-cases/network-policies.md @@ -96,7 +96,7 @@ However, the Capsule controller prevents Alice to delete the tenant network poli ``` alice@caas# kubectl -n oil-production delete networkpolicy capsule-oil-0 -Error from server (Capsule Network Policies cannot be deleted: please, reach out the system administrators): admission webhook "validating.network-policy.capsule.clastix.io" denied the request: Capsule Network Policies cannot be deleted: please, reach out the system administrators +Error from server (Capsule Network Policies cannot be deleted: please, reach out to the system administrators): admission webhook "validating.network-policy.capsule.clastix.io" denied the request: Capsule Network Policies cannot be deleted: please, reach out to the system administrators ``` # What’s next diff --git a/pkg/webhook/namespacequota/errors.go b/pkg/webhook/namespacequota/errors.go index 5e5f2720..9b5abece 100644 --- a/pkg/webhook/namespacequota/errors.go +++ b/pkg/webhook/namespacequota/errors.go @@ -23,5 +23,5 @@ func NewNamespaceQuotaExceededError() error { } func (namespaceQuotaExceededError) Error() string { - return "Cannot exceed Namespace quota: please, reach out the system administrators" + return "Cannot exceed Namespace quota: please, reach out to the system administrators" } diff --git a/pkg/webhook/networkpolicies/validating.go b/pkg/webhook/networkpolicies/validating.go index 9d4f8dfc..147e1812 100644 --- a/pkg/webhook/networkpolicies/validating.go +++ b/pkg/webhook/networkpolicies/validating.go @@ -82,7 +82,7 @@ func (r *handler) OnDelete(client client.Client, decoder *admission.Decoder) cap return admission.Errored(http.StatusInternalServerError, err) } if ok { - return admission.Denied("Capsule Network Policies cannot be deleted: please, reach out the system administrators") + return admission.Denied("Capsule Network Policies cannot be deleted: please, reach out to the system administrators") } return admission.Allowed("") @@ -102,7 +102,7 @@ func (r *handler) OnUpdate(client client.Client, decoder *admission.Decoder) cap return admission.Errored(http.StatusInternalServerError, err) } if ok { - return admission.Denied("Capsule Network Policies cannot be updated: please, reach out the system administrators") + return admission.Denied("Capsule Network Policies cannot be updated: please, reach out to the system administrators") } return admission.Allowed("") diff --git a/pkg/webhook/ownerreference/patching.go b/pkg/webhook/ownerreference/patching.go index bbef16ee..7590a54b 100644 --- a/pkg/webhook/ownerreference/patching.go +++ b/pkg/webhook/ownerreference/patching.go @@ -122,7 +122,7 @@ func (h *handler) OnCreate(clt client.Client, decoder *admission.Decoder) capsul sort.Sort(sort.Reverse(tenants)) if len(tenants) == 0 { - return admission.Denied("You do not have any Tenant assigned: please, reach out the system administrators") + return admission.Denied("You do not have any Tenant assigned: please, reach out to the system administrators") } if len(tenants) == 1 { diff --git a/pkg/webhook/tenantprefix/validating.go b/pkg/webhook/tenantprefix/validating.go index b62c05b2..284bf935 100644 --- a/pkg/webhook/tenantprefix/validating.go +++ b/pkg/webhook/tenantprefix/validating.go @@ -76,7 +76,7 @@ func (r *handler) OnCreate(clt client.Client, decoder *admission.Decoder) capsul } if r.protectedNamespacesRegex != nil { if matched := r.protectedNamespacesRegex.MatchString(ns.GetName()); matched { - return admission.Denied("Creating namespaces with name matching " + r.protectedNamespacesRegex.String() + " regexp is not allowed; please, reach out the system administrators") + return admission.Denied("Creating namespaces with name matching " + r.protectedNamespacesRegex.String() + " regexp is not allowed; please, reach out to the system administrators") } }