From 74b8ec98ec1c3efa35d310dc90d4982ca3ab3c9c Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Mon, 15 Jul 2019 09:04:39 +0200 Subject: [PATCH] Fix validation bug --- pkg/controller/jenkins/configuration/base/resources/pod.go | 2 +- pkg/controller/jenkins/configuration/base/validate.go | 7 ++++--- pkg/controller/jenkins/configuration/base/validate_test.go | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/resources/pod.go b/pkg/controller/jenkins/configuration/base/resources/pod.go index fe899575..64d911f7 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod.go +++ b/pkg/controller/jenkins/configuration/base/resources/pod.go @@ -288,7 +288,7 @@ func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins Containers: newContainers(jenkins), Volumes: append(GetJenkinsMasterPodBaseVolumes(jenkins), jenkins.Spec.Master.Volumes...), SecurityContext: jenkins.Spec.Master.SecurityContext, - ImagePullSecrets: jenkins.Spec.Master.ImagePullSecrets, + ImagePullSecrets: jenkins.Spec.Master.ImagePullSecrets, }, } } diff --git a/pkg/controller/jenkins/configuration/base/validate.go b/pkg/controller/jenkins/configuration/base/validate.go index c96da282..61f801e0 100644 --- a/pkg/controller/jenkins/configuration/base/validate.go +++ b/pkg/controller/jenkins/configuration/base/validate.go @@ -61,13 +61,14 @@ func (r *ReconcileJenkinsBaseConfiguration) Validate(jenkins *v1alpha2.Jenkins) } func (r *ReconcileJenkinsBaseConfiguration) validateImagePullSecrets() (bool, error) { + var err error for _, sr := range r.jenkins.Spec.Master.ImagePullSecrets { valid, err := r.validateImagePullSecret(sr.Name) if err != nil || !valid { - return true, err + return false, nil } } - return false, nil + return true, err } func (r *ReconcileJenkinsBaseConfiguration) validateImagePullSecret(name string) (bool, error) { @@ -92,7 +93,7 @@ func (r *ReconcileJenkinsBaseConfiguration) validateImagePullSecret(name string) r.logger.V(log.VWarn).Info("Docker Password is empty") return false, nil } - if secret.Data["docker-email"] == nil { + if secret.Data["docker-email"] == nil { r.logger.V(log.VWarn).Info("Docker Email is empty") return false, nil } diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go index 6deba48b..7a8aedbf 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/controller/jenkins/configuration/base/validate_test.go @@ -219,7 +219,6 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T got, err := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) - assert.Error(t, err) }) t.Run("no docker password", func(t *testing.T) { @@ -253,7 +252,6 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T got, err := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) - assert.Error(t, err) }) t.Run("no docker username", func(t *testing.T) { @@ -287,7 +285,6 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T got, err := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) - assert.Error(t, err) }) t.Run("no docker server", func(t *testing.T) { @@ -321,7 +318,6 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T got, err := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) - assert.Error(t, err) }) }