Merge pull request #14250 from bparees/owner_controller

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/generator/generator.go

@@ -481,6 +481,7 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx apirequest.Context, bc *bui
 	obj, _ := kapi.Scheme.Copy(bc)
 	bcCopy := obj.(*buildapi.BuildConfig)
 	serviceAccount := getServiceAccount(bcCopy, g.DefaultServiceAccountName)
+	t := true
 	build := &buildapi.Build{
 		Spec: buildapi.BuildSpec{
 			CommonSpec: buildapi.CommonSpec{
@@ -504,6 +505,7 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx apirequest.Context, bc *bui
 					Kind:       "BuildConfig", // BuildConfig.Kind is not populated
 					Name:       bcCopy.Name,
 					UID:        bcCopy.UID,
+					Controller: &t,
 				},
 			},
 		},

pkg/build/generator/generator_test.go

@@ -965,7 +965,9 @@ func TestGenerateBuildFromConfig(t *testing.T) {
 	if len(build.OwnerReferences) == 0 || build.OwnerReferences[0].Kind != "BuildConfig" || build.OwnerReferences[0].Name != bc.Name {
 		t.Errorf("generated build does not have OwnerReference to parent BuildConfig")
 	}
-
+	if build.OwnerReferences[0].Controller == nil || !*build.OwnerReferences[0].Controller {
+		t.Errorf("generated build does not have OwnerReference to parent BuildConfig marked as a controller relationship")
+	}
 	// Test long name
 	bc.Name = strings.Repeat("a", 100)
 	build, err = generator.generateBuildFromConfig(apirequest.NewContext(), bc, revision, nil)