Skip to content

Commit 923b087

Browse files
authored
hotfix: nil pointer (#199)
1 parent 13e3820 commit 923b087

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

api/v1alpha1/virtualservice_methods.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,14 @@ func (vs *VirtualService) IsEqual(other *VirtualService) bool {
204204
return false
205205
}
206206
if vs.Spec.Template != nil && other.Spec.Template != nil {
207-
if vs.Spec.Template.Name != other.Spec.Template.Name ||
208-
*vs.Spec.Template.Namespace != *other.Spec.Template.Namespace { // TODO: check
207+
if vs.Spec.Template.Name != other.Spec.Template.Name {
208+
return false
209+
}
210+
if (vs.Spec.Template.Namespace == nil) != (other.Spec.Template.Namespace == nil) {
211+
return false
212+
}
213+
if vs.Spec.Template.Namespace != nil && other.Spec.Template.Namespace != nil &&
214+
*vs.Spec.Template.Namespace != *other.Spec.Template.Namespace {
209215
return false
210216
}
211217
}

0 commit comments

Comments
 (0)