karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix setting resource selector default namespace for policy 

Signed-off-by: carlory <baofa.fan@daocloud.io>
This commit is contained in:
carlory 2022-11-23 20:11:11 +08:00
parent 61110bb557
commit 990c079eb6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/webhook/overridepolicy/mutating.go
View File

@ -30,10 +30,13 @@ func (a *MutatingAdmission) Handle(ctx context.Context, req admission.Request) a
}
// Set default namespace for all resource selector if not set.
// We need to get the default namespace from the request because for kube-apiserver < v1.24,
// the namespace of the object with namespace unset in the mutating webook chain of a create request
// is not populated yet. See https://github.com/kubernetes/kubernetes/pull/94637 for more details.
for i := range policy.Spec.ResourceSelectors {
if len(policy.Spec.ResourceSelectors[i].Namespace) == 0 {
klog.Infof("Setting resource selector default namespace for policy: %s/%s", policy.Namespace, policy.Name)
policy.Spec.ResourceSelectors[i].Namespace = policy.Namespace
klog.Infof("Setting resource selector default namespace for policy: %s/%s", req.Namespace, policy.Name)
policy.Spec.ResourceSelectors[i].Namespace = req.Namespace
}
}

9
pkg/webhook/propagationpolicy/mutating.go
View File

@ -42,13 +42,16 @@ func (a *MutatingAdmission) Handle(ctx context.Context, req admission.Request) a
if err != nil {
return admission.Errored(http.StatusBadRequest, err)
}
klog.V(2).Infof("Mutating PropagationPolicy(%s/%s) for request: %s", policy.Namespace, policy.Name, req.Operation)
klog.V(2).Infof("Mutating PropagationPolicy(%s/%s) for request: %s", req.Namespace, policy.Name, req.Operation)
// Set default namespace for all resource selector if not set.
// We need to get the default namespace from the request because for kube-apiserver < v1.24,
// the namespace of the object with namespace unset in the mutating webook chain of a create request
// is not populated yet. See https://github.com/kubernetes/kubernetes/pull/94637 for more details.
for i := range policy.Spec.ResourceSelectors {
if len(policy.Spec.ResourceSelectors[i].Namespace) == 0 {
klog.Infof("Setting resource selector default namespace for policy: %s/%s", policy.Namespace, policy.Name)
policy.Spec.ResourceSelectors[i].Namespace = policy.Namespace
klog.Infof("Setting resource selector default namespace for policy: %s/%s", req.Namespace, policy.Name)
policy.Spec.ResourceSelectors[i].Namespace = req.Namespace
}
}