Skip to content

Commit 96734c5

Browse files
committed
strict pdb typemeta check
1 parent 274b7b3 commit 96734c5

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

patch/ignorepdb.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,15 @@ func IgnorePDBSelector() CalculateOption {
3434
return []byte{}, []byte{}, errors.Wrap(err, "could not unmarshal byte sequence for modified")
3535
}
3636

37-
if isPDB(currentResource) || isPDB(modifiedResource) {
38-
if reflect.DeepEqual(getPDBSelector(currentResource), getPDBSelector(modifiedResource)) {
39-
var err error
40-
current, err = deletePDBSelector(currentResource)
41-
if err != nil {
42-
return nil, nil, errors.Wrap(err, "delete pdb selector from current")
43-
}
44-
modified, err = deletePDBSelector(modifiedResource)
45-
if err != nil {
46-
return nil, nil, errors.Wrap(err, "delete pdb selector from modified")
47-
}
37+
if isPDB(currentResource) && isPDB(modifiedResource) && reflect.DeepEqual(getPDBSelector(currentResource), getPDBSelector(modifiedResource)) {
38+
var err error
39+
current, err = deletePDBSelector(currentResource)
40+
if err != nil {
41+
return nil, nil, errors.Wrap(err, "delete pdb selector from current")
42+
}
43+
modified, err = deletePDBSelector(modifiedResource)
44+
if err != nil {
45+
return nil, nil, errors.Wrap(err, "delete pdb selector from modified")
4846
}
4947
}
5048

tests/integration_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,10 @@ func TestIntegration(t *testing.T) {
576576
}),
577577
NewTestMatch("pdb match",
578578
&v1beta12.PodDisruptionBudget{
579+
TypeMeta: metav1.TypeMeta{
580+
APIVersion: v1beta12.SchemeGroupVersion.String(),
581+
Kind: "PodDisruptionBudget",
582+
},
579583
ObjectMeta: standardObjectMeta(),
580584
Spec: v1beta12.PodDisruptionBudgetSpec{
581585
MinAvailable: intstrRef(intstr.FromInt(1)),
@@ -588,6 +592,10 @@ func TestIntegration(t *testing.T) {
588592
}),
589593
NewTestDiff("pdb diff on matchlabels",
590594
&v1beta12.PodDisruptionBudget{
595+
TypeMeta: metav1.TypeMeta{
596+
APIVersion: v1beta12.SchemeGroupVersion.String(),
597+
Kind: "PodDisruptionBudget",
598+
},
591599
ObjectMeta: standardObjectMeta(),
592600
Spec: v1beta12.PodDisruptionBudgetSpec{
593601
MinAvailable: intstrRef(intstr.FromInt(1)),

0 commit comments

Comments
 (0)