Skip to content

Commit 8b12ec9

Browse files
committed
boring: legacy scheme moved
1 parent 6daf94b commit 8b12ec9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/build/controller/jenkins/jenkins.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (t *PipelineTemplate) Process() (*kapi.List, []error) {
7575
func (t *PipelineTemplate) HasJenkinsService(items *kapi.List) bool {
7676
accessor := meta.NewAccessor()
7777
for _, item := range items.Items {
78-
kind, _, err := legacyscheme.Scheme.ObjectKind(item)
78+
kinds, _, err := legacyscheme.Scheme.ObjectKinds(item)
7979
if err != nil {
8080
glog.Infof("Error checking Jenkins service kind: %v", err)
8181
return false
@@ -85,9 +85,12 @@ func (t *PipelineTemplate) HasJenkinsService(items *kapi.List) bool {
8585
glog.Infof("Error checking Jenkins service name: %v", err)
8686
return false
8787
}
88-
glog.Infof("Jenkins Pipeline template object %q with name %q", name, kind.Kind)
89-
if name == t.Config.ServiceName && kind.Kind == "Service" {
90-
return true
88+
glog.Infof("Jenkins Pipeline template object %q with name %q", name, kinds[0].Kind)
89+
90+
for _, kind := range kinds {
91+
if name == t.Config.ServiceName && kind.GroupKind() == kapi.Kind("Service") {
92+
return true
93+
}
9194
}
9295
}
9396
return false

0 commit comments

Comments
 (0)