mirror of
https://github.com/outbackdingo/kubernetes.git
synced 2026-01-27 10:19:35 +00:00
Merge pull request #129970 from mortent/AddResourceV1beta2API
Add resource v1beta2 API
This commit is contained in:
@@ -856,7 +856,7 @@ func (p *Plugin) admitResourceSlice(nodeName string, a admission.Attributes) err
|
||||
return admission.NewForbidden(a, fmt.Errorf("unexpected type %T", a.GetObject()))
|
||||
}
|
||||
|
||||
if slice.Spec.NodeName != nodeName {
|
||||
if slice.Spec.NodeName == nil || *slice.Spec.NodeName != nodeName {
|
||||
return admission.NewForbidden(a, errors.New("can only create ResourceSlice with the same NodeName as the requesting node"))
|
||||
}
|
||||
case admission.Delete:
|
||||
@@ -865,7 +865,7 @@ func (p *Plugin) admitResourceSlice(nodeName string, a admission.Attributes) err
|
||||
return admission.NewForbidden(a, fmt.Errorf("unexpected type %T", a.GetOldObject()))
|
||||
}
|
||||
|
||||
if slice.Spec.NodeName != nodeName {
|
||||
if slice.Spec.NodeName == nil || *slice.Spec.NodeName != nodeName {
|
||||
return admission.NewForbidden(a, errors.New("can only delete ResourceSlice with the same NodeName as the requesting node"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2154,7 +2154,7 @@ func TestAdmitResourceSlice(t *testing.T) {
|
||||
Name: "something",
|
||||
},
|
||||
Spec: resourceapi.ResourceSliceSpec{
|
||||
NodeName: nodename,
|
||||
NodeName: pointer.String(nodename),
|
||||
},
|
||||
}
|
||||
sliceOtherNode := &resourceapi.ResourceSlice{
|
||||
@@ -2162,7 +2162,7 @@ func TestAdmitResourceSlice(t *testing.T) {
|
||||
Name: "something",
|
||||
},
|
||||
Spec: resourceapi.ResourceSliceSpec{
|
||||
NodeName: nodename + "-other",
|
||||
NodeName: pointer.String(nodename + "-other"),
|
||||
},
|
||||
}
|
||||
sliceNoNode := &resourceapi.ResourceSlice{
|
||||
@@ -2170,7 +2170,7 @@ func TestAdmitResourceSlice(t *testing.T) {
|
||||
Name: "something",
|
||||
},
|
||||
Spec: resourceapi.ResourceSliceSpec{
|
||||
NodeName: "",
|
||||
NodeName: nil,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user