diff --git a/pkg/webhook/ingress/validating.go b/pkg/webhook/ingress/validating.go index baa37bcd..ed50f6e8 100644 --- a/pkg/webhook/ingress/validating.go +++ b/pkg/webhook/ingress/validating.go @@ -34,8 +34,8 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-ingress,mutating=false,failurePolicy=fail,groups=networking.k8s.io;extensions,resources=ingresses,verbs=create;update,versions=v1beta1,name=ingress-v1beta1.capsule.clastix.io -// +kubebuilder:webhook:path=/validating-ingress,mutating=false,failurePolicy=fail,groups=networking.k8s.io,resources=ingresses,verbs=create;update,versions=v1,name=ingress-v1.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-ingress,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups=networking.k8s.io;extensions,resources=ingresses,verbs=create;update,versions=v1beta1,name=ingress-v1beta1.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-ingress,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups=networking.k8s.io,resources=ingresses,verbs=create;update,versions=v1,name=ingress-v1.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/namespacequota/validating.go b/pkg/webhook/namespacequota/validating.go index 080008fa..5bdd2f11 100644 --- a/pkg/webhook/namespacequota/validating.go +++ b/pkg/webhook/namespacequota/validating.go @@ -29,7 +29,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validate-v1-namespace-quota,mutating=false,failurePolicy=fail,groups="",resources=namespaces,verbs=create,versions=v1,name=quota.namespace.capsule.clastix.io +// +kubebuilder:webhook:path=/validate-v1-namespace-quota,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups="",resources=namespaces,verbs=create,versions=v1,name=quota.namespace.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/networkpolicies/validating.go b/pkg/webhook/networkpolicies/validating.go index 147e1812..8e15807f 100644 --- a/pkg/webhook/networkpolicies/validating.go +++ b/pkg/webhook/networkpolicies/validating.go @@ -29,7 +29,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-v1-network-policy,mutating=false,failurePolicy=fail,groups=networking.k8s.io,resources=networkpolicies,verbs=create;update;delete,versions=v1,name=validating.network-policy.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-v1-network-policy,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups=networking.k8s.io,resources=networkpolicies,verbs=create;update;delete,versions=v1,name=validating.network-policy.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/ownerreference/patching.go b/pkg/webhook/ownerreference/patching.go index 1cf37864..9eed372f 100644 --- a/pkg/webhook/ownerreference/patching.go +++ b/pkg/webhook/ownerreference/patching.go @@ -36,7 +36,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/mutate-v1-namespace-owner-reference,mutating=true,failurePolicy=fail,groups="",resources=namespaces,verbs=create,versions=v1,name=owner.namespace.capsule.clastix.io +// +kubebuilder:webhook:path=/mutate-v1-namespace-owner-reference,mutating=true,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups="",resources=namespaces,verbs=create,versions=v1,name=owner.namespace.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/pvc/validating.go b/pkg/webhook/pvc/validating.go index f77678cf..b42621d2 100644 --- a/pkg/webhook/pvc/validating.go +++ b/pkg/webhook/pvc/validating.go @@ -29,7 +29,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-v1-pvc,mutating=false,failurePolicy=fail,groups="",resources=persistentvolumeclaims,verbs=create,versions=v1,name=pvc.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-v1-pvc,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups="",resources=persistentvolumeclaims,verbs=create,versions=v1,name=pvc.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/registry/validating.go b/pkg/webhook/registry/validating.go index 20cde7e1..49b74f20 100644 --- a/pkg/webhook/registry/validating.go +++ b/pkg/webhook/registry/validating.go @@ -30,7 +30,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-v1-registry,mutating=false,failurePolicy=ignore,groups="",resources=pods,verbs=create,versions=v1,name=pod.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-v1-registry,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=ignore,groups="",resources=pods,verbs=create,versions=v1,name=pod.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/router.go b/pkg/webhook/router.go index 4be2445a..e9b51721 100644 --- a/pkg/webhook/router.go +++ b/pkg/webhook/router.go @@ -20,7 +20,7 @@ import ( "context" "io/ioutil" - admissionv1beta1 "k8s.io/api/admission/v1beta1" + admissionv1 "k8s.io/api/admission/v1" controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook" @@ -53,11 +53,11 @@ type handlerRouter struct { func (r *handlerRouter) Handle(ctx context.Context, req admission.Request) admission.Response { switch req.Operation { - case admissionv1beta1.Create: + case admissionv1.Create: return r.handler.OnCreate(r.client, r.decoder)(ctx, req) - case admissionv1beta1.Update: + case admissionv1.Update: return r.handler.OnUpdate(r.client, r.decoder)(ctx, req) - case admissionv1beta1.Delete: + case admissionv1.Delete: return r.handler.OnDelete(r.client, r.decoder)(ctx, req) default: return admission.Allowed("") diff --git a/pkg/webhook/services/validating.go b/pkg/webhook/services/validating.go index 18df21d1..455be162 100644 --- a/pkg/webhook/services/validating.go +++ b/pkg/webhook/services/validating.go @@ -30,7 +30,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-external-service-ips,mutating=false,failurePolicy=fail,groups="",resources=services,verbs=create;update,versions=v1,name=validating-external-service-ips.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-external-service-ips,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups="",resources=services,verbs=create;update,versions=v1,name=validating-external-service-ips.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/tenant/validating.go b/pkg/webhook/tenant/validating.go index a39c1faa..4a715fdd 100644 --- a/pkg/webhook/tenant/validating.go +++ b/pkg/webhook/tenant/validating.go @@ -29,7 +29,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-v1-tenant,mutating=false,failurePolicy=fail,groups="capsule.clastix.io",resources=tenants,verbs=create;update,versions=v1alpha1,name=tenant.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-v1-tenant,mutating=false,sideEffects=None,admissionReviewVersions=v1,failurePolicy=fail,groups="capsule.clastix.io",resources=tenants,verbs=create;update,versions=v1alpha1,name=tenant.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler diff --git a/pkg/webhook/tenantprefix/validating.go b/pkg/webhook/tenantprefix/validating.go index 69c55ff7..b16778df 100644 --- a/pkg/webhook/tenantprefix/validating.go +++ b/pkg/webhook/tenantprefix/validating.go @@ -32,7 +32,7 @@ import ( capsulewebhook "github.com/clastix/capsule/pkg/webhook" ) -// +kubebuilder:webhook:path=/validating-v1-namespace-tenant-prefix,mutating=false,failurePolicy=fail,groups="",resources=namespaces,verbs=create,versions=v1,name=prefix.namespace.capsule.clastix.io +// +kubebuilder:webhook:path=/validating-v1-namespace-tenant-prefix,sideEffects=None,admissionReviewVersions=v1,mutating=false,failurePolicy=fail,groups="",resources=namespaces,verbs=create,versions=v1,name=prefix.namespace.capsule.clastix.io type webhook struct { handler capsulewebhook.Handler