public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix validation bug

This commit is contained in:
Jakub Al-Khalili 2019-07-15 09:04:39 +02:00
parent feae4e6e3d
commit 74b8ec98ec
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/configuration/base/resources/pod.go
View File

@ -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,
},
}
}

7
pkg/controller/jenkins/configuration/base/validate.go
View File

@ -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
}

4
pkg/controller/jenkins/configuration/base/validate_test.go
View File

@ -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)
})
}