Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,16 @@ var (
)

type clusterResourceOverrideValidator struct {
client client.Client
// Note: we have to use the uncached client here to avoid getting stale data
// since we need to guarantee that a resource cannot be selected by multiple overrides.
client client.Reader
decoder webhook.AdmissionDecoder
}

// Add registers the webhook for K8s bulit-in object types.
func Add(mgr manager.Manager) error {
hookServer := mgr.GetWebhookServer()
hookServer.Register(ValidationPath, &webhook.Admission{Handler: &clusterResourceOverrideValidator{mgr.GetClient(), admission.NewDecoder(mgr.GetScheme())}})
hookServer.Register(ValidationPath, &webhook.Admission{Handler: &clusterResourceOverrideValidator{mgr.GetAPIReader(), admission.NewDecoder(mgr.GetScheme())}})
return nil
}

Expand Down Expand Up @@ -80,7 +82,7 @@ func (v *clusterResourceOverrideValidator) Handle(ctx context.Context, req admis
}

// listClusterResourceOverride returns a list of cluster resource overrides.
func listClusterResourceOverride(ctx context.Context, client client.Client) (*placementv1beta1.ClusterResourceOverrideList, error) {
func listClusterResourceOverride(ctx context.Context, client client.Reader) (*placementv1beta1.ClusterResourceOverrideList, error) {
croList := &placementv1beta1.ClusterResourceOverrideList{}
if err := client.List(ctx, croList); err != nil {
klog.ErrorS(err, "Failed to list clusterResourceOverrides when validating")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,16 @@ var (
)

type resourceOverrideValidator struct {
client client.Client
// Note: we have to use the uncached client here to avoid getting stale data
// since we need to guarantee that a resource cannot be selected by multiple overrides.
client client.Reader
decoder webhook.AdmissionDecoder
}

// Add registers the webhook for K8s bulit-in object types.
func Add(mgr manager.Manager) error {
hookServer := mgr.GetWebhookServer()
hookServer.Register(ValidationPath, &webhook.Admission{Handler: &resourceOverrideValidator{mgr.GetClient(), admission.NewDecoder(mgr.GetScheme())}})
hookServer.Register(ValidationPath, &webhook.Admission{Handler: &resourceOverrideValidator{mgr.GetAPIReader(), admission.NewDecoder(mgr.GetScheme())}})
return nil
}

Expand Down
Loading