Merge pull request #572 from shaneutt/master

Remove race condition from templated StartTestManager
kubernetes-sigs · Jan 23, 2019 · c4a171f · c4a171f
2 parents a085eb8 + eff8a42
commit c4a171f
Show file tree

Hide file tree

Showing 83 changed files with 116 additions and 92 deletions.
diff --git a/pkg/scaffold/controller/controllersuitetest.go b/pkg/scaffold/controller/controllersuitetest.go
@@ -96,10 +96,10 @@ func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan
 func StartTestManager(mgr manager.Manager, g *gomega.GomegaWithT) (chan struct{}, *sync.WaitGroup) {
 	stop := make(chan struct{})
 	wg := &sync.WaitGroup{}
+	wg.Add(1)
 	go func() {
-		wg.Add(1)
+		defer wg.Done()
 		g.Expect(mgr.Start(stop)).NotTo(gomega.HaveOccurred())
-		wg.Done()
 	}()
 	return stop, wg
 }

diff --git a/pkg/scaffold/project/project_test.go b/pkg/scaffold/project/project_test.go
@@ -32,7 +32,7 @@ var _ = Describe("Project", func() {
 		})
 
 		It("should match the golden file", func() {
-			instance := &Boilerplate{Year: "2018", License: "apache2", Owner: "The Kubernetes authors"}
+			instance := &Boilerplate{Year: "2019", License: "apache2", Owner: "The Kubernetes authors"}
 			Expect(s.Execute(input.Options{}, instance)).NotTo(HaveOccurred())
 			Expect(result.Actual.String()).To(BeEquivalentTo(result.Golden))
 		})
@@ -45,15 +45,15 @@ var _ = Describe("Project", func() {
 
 		Context("for apache2", func() {
 			It("should write the apache2 boilerplate with specified owners", func() {
-				instance := &Boilerplate{Year: "2018", Owner: "Example Owners"}
+				instance := &Boilerplate{Year: "2019", Owner: "Example Owners"}
 				Expect(s.Execute(input.Options{}, instance)).NotTo(HaveOccurred())
 				e := strings.Replace(
 					result.Golden, "The Kubernetes authors", "Example Owners", -1)
 				Expect(result.Actual.String()).To(BeEquivalentTo(e))
 			})
 
 			It("should use apache2 as the default", func() {
-				instance := &Boilerplate{Year: "2018", Owner: "The Kubernetes authors"}
+				instance := &Boilerplate{Year: "2019", Owner: "The Kubernetes authors"}
 				Expect(s.Execute(input.Options{}, instance)).NotTo(HaveOccurred())
 				Expect(result.Actual.String()).To(BeEquivalentTo(result.Golden))
 			})

diff --git a/test/project/cmd/manager/main.go b/test/project/cmd/manager/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/config/crds/creatures_v2alpha1_kraken.yaml b/test/project/config/crds/creatures_v2alpha1_kraken.yaml
@@ -15,8 +15,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

diff --git a/test/project/config/crds/crew_v1_firstmate.yaml b/test/project/config/crds/crew_v1_firstmate.yaml
@@ -15,8 +15,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

diff --git a/test/project/config/crds/policy_v1beta1_healthcheckpolicy.yaml b/test/project/config/crds/policy_v1beta1_healthcheckpolicy.yaml
@@ -15,8 +15,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

diff --git a/test/project/config/crds/ship_v1beta1_frigate.yaml b/test/project/config/crds/ship_v1beta1_frigate.yaml
@@ -15,8 +15,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

diff --git a/test/project/hack/boilerplate.go.txt b/test/project/hack/boilerplate.go.txt
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/addtoscheme_creatures_v2alpha1.go b/test/project/pkg/apis/addtoscheme_creatures_v2alpha1.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/addtoscheme_crew_v1.go b/test/project/pkg/apis/addtoscheme_crew_v1.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/addtoscheme_policy_v1beta1.go b/test/project/pkg/apis/addtoscheme_policy_v1beta1.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/addtoscheme_ship_v1beta1.go b/test/project/pkg/apis/addtoscheme_ship_v1beta1.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/apis.go b/test/project/pkg/apis/apis.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/group.go b/test/project/pkg/apis/creatures/group.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/v2alpha1/doc.go b/test/project/pkg/apis/creatures/v2alpha1/doc.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/v2alpha1/kraken_types.go b/test/project/pkg/apis/creatures/v2alpha1/kraken_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go b/test/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/v2alpha1/register.go b/test/project/pkg/apis/creatures/v2alpha1/register.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go b/test/project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go b/test/project/pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go
diff --git a/test/project/pkg/apis/crew/group.go b/test/project/pkg/apis/crew/group.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/crew/v1/doc.go b/test/project/pkg/apis/crew/v1/doc.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/crew/v1/firstmate_types.go b/test/project/pkg/apis/crew/v1/firstmate_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/crew/v1/firstmate_types_test.go b/test/project/pkg/apis/crew/v1/firstmate_types_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/crew/v1/register.go b/test/project/pkg/apis/crew/v1/register.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/crew/v1/v1_suite_test.go b/test/project/pkg/apis/crew/v1/v1_suite_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/crew/v1/zz_generated.deepcopy.go b/test/project/pkg/apis/crew/v1/zz_generated.deepcopy.go
diff --git a/test/project/pkg/apis/policy/group.go b/test/project/pkg/apis/policy/group.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/policy/v1beta1/doc.go b/test/project/pkg/apis/policy/v1beta1/doc.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go b/test/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go b/test/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/policy/v1beta1/register.go b/test/project/pkg/apis/policy/v1beta1/register.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go b/test/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/test/project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go
diff --git a/test/project/pkg/apis/ship/group.go b/test/project/pkg/apis/ship/group.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/ship/v1beta1/doc.go b/test/project/pkg/apis/ship/v1beta1/doc.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/ship/v1beta1/frigate_types.go b/test/project/pkg/apis/ship/v1beta1/frigate_types.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/ship/v1beta1/frigate_types_test.go b/test/project/pkg/apis/ship/v1beta1/frigate_types_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/ship/v1beta1/register.go b/test/project/pkg/apis/ship/v1beta1/register.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go b/test/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go b/test/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go
diff --git a/test/project/pkg/controller/add_firstmate.go b/test/project/pkg/controller/add_firstmate.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/controller/add_frigate.go b/test/project/pkg/controller/add_frigate.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/controller/add_healthcheckpolicy.go b/test/project/pkg/controller/add_healthcheckpolicy.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/controller/add_kraken.go b/test/project/pkg/controller/add_kraken.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/controller/add_namespace.go b/test/project/pkg/controller/add_namespace.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/test/project/pkg/controller/controller.go b/test/project/pkg/controller/controller.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes authors.
+Copyright 2019 The Kubernetes authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.