diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index 6b9336a8..baf8e658 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -534,14 +534,13 @@ func (r *ReconcileJenkinsBaseConfiguration) checkForPodRecreation(currentJenkins currentJenkinsMasterPod.Spec.ImagePullSecrets, r.Configuration.Jenkins.Spec.Master.ImagePullSecrets)) } - if !reflect.DeepEqual(r.Configuration.Jenkins.Spec.Master.NodeSelector, currentJenkinsMasterPod.Spec.NodeSelector) { + if !compareMap(r.Configuration.Jenkins.Spec.Master.NodeSelector, currentJenkinsMasterPod.Spec.NodeSelector) { messages = append(messages, "Jenkins pod node selector has changed") verbose = append(verbose, fmt.Sprintf("Jenkins pod node selector has changed, actual '%+v' required '%+v'", currentJenkinsMasterPod.Spec.NodeSelector, r.Configuration.Jenkins.Spec.Master.NodeSelector)) } - if len(r.Configuration.Jenkins.Spec.Master.Annotations) > 0 && - !comparePodAnnotations(r.Configuration.Jenkins.Spec.Master.Annotations, currentJenkinsMasterPod.ObjectMeta.Annotations) { + if !compareMap(r.Configuration.Jenkins.Spec.Master.Annotations, currentJenkinsMasterPod.ObjectMeta.Annotations) { messages = append(messages, "Jenkins pod annotations have changed") verbose = append(verbose, fmt.Sprintf("Jenkins pod annotations have changed, actual '%+v' required '%+v'", currentJenkinsMasterPod.ObjectMeta.Annotations, r.Configuration.Jenkins.Spec.Master.Annotations)) @@ -676,7 +675,7 @@ func compareImagePullSecrets(expected, actual []corev1.LocalObjectReference) boo return true } -func comparePodAnnotations(expected, actual map[string]string) bool { +func compareMap(expected, actual map[string]string) bool { for expectedKey, expectedValue := range expected { actualValue, found := actual[expectedKey] if !found { diff --git a/pkg/controller/jenkins/configuration/base/reconcile_test.go b/pkg/controller/jenkins/configuration/base/reconcile_test.go index 205f3d36..4ae2040d 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile_test.go +++ b/pkg/controller/jenkins/configuration/base/reconcile_test.go @@ -648,12 +648,12 @@ func Test_compareEnv(t *testing.T) { }) } -func TestComparePodAnnotations(t *testing.T) { +func TestCompareMap(t *testing.T) { t.Run("empty", func(t *testing.T) { expectedAnnotations := map[string]string{} actualAnnotations := map[string]string{} - got := comparePodAnnotations(expectedAnnotations, actualAnnotations) + got := compareMap(expectedAnnotations, actualAnnotations) assert.True(t, got) }) @@ -661,7 +661,7 @@ func TestComparePodAnnotations(t *testing.T) { expectedAnnotations := map[string]string{"one": "two"} actualAnnotations := expectedAnnotations - got := comparePodAnnotations(expectedAnnotations, actualAnnotations) + got := compareMap(expectedAnnotations, actualAnnotations) assert.True(t, got) }) @@ -669,7 +669,7 @@ func TestComparePodAnnotations(t *testing.T) { expectedAnnotations := map[string]string{"one": "two"} actualAnnotations := map[string]string{"one": "two", "three": "four"} - got := comparePodAnnotations(expectedAnnotations, actualAnnotations) + got := compareMap(expectedAnnotations, actualAnnotations) assert.True(t, got) }) @@ -677,7 +677,7 @@ func TestComparePodAnnotations(t *testing.T) { expectedAnnotations := map[string]string{"one": "two"} actualAnnotations := map[string]string{"three": "four"} - got := comparePodAnnotations(expectedAnnotations, actualAnnotations) + got := compareMap(expectedAnnotations, actualAnnotations) assert.False(t, got) }) @@ -685,7 +685,7 @@ func TestComparePodAnnotations(t *testing.T) { expectedAnnotations := map[string]string{"one": "two"} actualAnnotations := map[string]string{"one": "three"} - got := comparePodAnnotations(expectedAnnotations, actualAnnotations) + got := compareMap(expectedAnnotations, actualAnnotations) assert.False(t, got) }) @@ -693,7 +693,7 @@ func TestComparePodAnnotations(t *testing.T) { expectedAnnotations := map[string]string{"one": "two", "missing": "something"} actualAnnotations := map[string]string{"one": "three"} - got := comparePodAnnotations(expectedAnnotations, actualAnnotations) + got := compareMap(expectedAnnotations, actualAnnotations) assert.False(t, got) })