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

Improve groovy script checker

This commit is contained in:
Jakub Al-Khalili 2019-07-31 11:11:15 +02:00
parent 063f0c074b
commit 3a7a4049f3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/jenkins/groovy/groovy.go
View File

@ -58,9 +58,11 @@ func (g *Groovy) EnsureSingle(source, name, hash, groovyScript string) (requeue
var appliedGroovyScripts []v1alpha2.AppliedGroovyScript var appliedGroovyScripts []v1alpha2.AppliedGroovyScript
for _, ags := range g.jenkins.Status.AppliedGroovyScripts { for _, ags := range g.jenkins.Status.AppliedGroovyScripts {
if g.configurationType != ags.ConfigurationType || ags.Source != source || ags.Name != name { if g.configurationType == ags.ConfigurationType && ags.Source == source && ags.Name == name {
appliedGroovyScripts = append(appliedGroovyScripts, ags) continue
} }
appliedGroovyScripts = append(appliedGroovyScripts, ags)
} }
appliedGroovyScripts = append(appliedGroovyScripts, v1alpha2.AppliedGroovyScript{ appliedGroovyScripts = append(appliedGroovyScripts, v1alpha2.AppliedGroovyScript{
ConfigurationType: g.configurationType, ConfigurationType: g.configurationType,