Skip to content

Commit 3614a5b

Browse files
Merge pull request #20577 from bparees/loglevel
make sure build loglevel is always being set
2 parents 5be47df + 34569b1 commit 3614a5b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/build/controller/build/defaults/defaults.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ type BuildDefaults struct {
1919

2020
// ApplyDefaults applies configured build defaults to a build pod
2121
func (b BuildDefaults) ApplyDefaults(pod *v1.Pod) error {
22-
if b.Config == nil {
23-
return nil
24-
}
25-
2622
build, err := common.GetBuildFromPod(pod)
2723
if err != nil {
2824
return nil
2925
}
3026

27+
if b.Config == nil {
28+
// even if there's no config for the defaulter, we need to set up the loglevel.
29+
return setPodLogLevelFromBuild(pod, build)
30+
}
31+
3132
glog.V(4).Infof("Applying defaults to build %s/%s", build.Namespace, build.Name)
3233
b.applyBuildDefaults(build)
3334

0 commit comments

Comments
 (0)