From 770b9b15b5f717c14877e520243583e8afec29bd Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Thu, 18 May 2017 17:42:31 -0400 Subject: [PATCH] mark build->buildconfig ownerref as a controller --- pkg/build/generator/generator.go | 2 ++ pkg/build/generator/generator_test.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/build/generator/generator.go b/pkg/build/generator/generator.go index 5f355b780790..cbfc7277b52c 100644 --- a/pkg/build/generator/generator.go +++ b/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, }, }, }, diff --git a/pkg/build/generator/generator_test.go b/pkg/build/generator/generator_test.go index 5a55db43778a..3d0cb0ee7708 100644 --- a/pkg/build/generator/generator_test.go +++ b/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)