Skip to content

Commit 511b470

Browse files
authored
Merge pull request #748 from SchSeba/allow_to_remove_default_pool
allow to remove a sriovPool named default
2 parents 4563178 + e142088 commit 511b470

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

pkg/webhook/validate.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ func validateSriovNetworkPoolConfig(cr *sriovnetworkv1.SriovNetworkPoolConfig, o
9696
log.Log.V(2).Info("validateSriovNetworkPoolConfig", "object", cr)
9797
var warnings []string
9898

99-
if cr.GetName() == consts.DefaultConfigName && operation == v1.Delete {
100-
return false, warnings, fmt.Errorf("default SriovOperatorConfig shouldn't be deleted")
101-
}
102-
10399
if (cr.Spec.MaxUnavailable != nil || cr.Spec.NodeSelector != nil) && cr.Spec.OvsHardwareOffloadConfig.Name != "" {
104100
return false, warnings, fmt.Errorf("SriovOperatorConfig can't have both parallel configuration and OvsHardwareOffloadConfig")
105101
}

pkg/webhook/validate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ func TestValidateSriovNetworkPoolConfigWithDefault(t *testing.T) {
229229
snclient = fakesnclientset.NewSimpleClientset()
230230

231231
ok, _, err := validateSriovNetworkPoolConfig(config, "DELETE")
232-
g.Expect(err).To(HaveOccurred())
233-
g.Expect(ok).To(Equal(false))
232+
g.Expect(err).ToNot(HaveOccurred())
233+
g.Expect(ok).To(Equal(true))
234234

235235
ok, _, err = validateSriovNetworkPoolConfig(config, "UPDATE")
236236
g.Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)