Skip to content

Commit 6cc395e

Browse files
committed
fix: backport changes from #64
1 parent 31e827d commit 6cc395e

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

api/v2/config/controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ func (c *NewControllerConfig) validate() error {
132132
if c.SeedConfig == nil {
133133
return fmt.Errorf("seed config must be specified")
134134
}
135-
if c.SeedNamespace == "" {
136-
return fmt.Errorf("seed namespace must be specified")
137-
}
138135
if c.SeedAPIServerURL == "" {
139136
return fmt.Errorf("seed api server url must be specified")
140137
}

api/v2/validation/firewalldeployment.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ func (*firewallDeploymentValidator) validateSpec(log logr.Logger, f *v2.Firewall
4949
})
5050
if err != nil {
5151
allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), f.Selector, ""))
52-
}
53-
54-
if !selector.Empty() {
52+
} else if !selector.Empty() {
5553
labels := labels.Set(f.Template.Labels)
5654
if !selector.Matches(labels) {
5755
allErrs = append(allErrs, field.Invalid(fldPath.Child("template", "metadata", "labels"), f.Template.Labels, "`selector` does not match template `labels`"))

0 commit comments

Comments
 (0)