🐛 fix copyright info when has not owner set

kubernetes-sigs · Oct 28, 2020 · 1cd4e65 · 1cd4e65
1 parent 70108bf
commit 1cd4e65
Show file tree

Hide file tree

Showing 134 changed files with 140 additions and 0 deletions.
diff --git a/pkg/plugin/v2/scaffolds/internal/templates/boilerplate.go b/pkg/plugin/v2/scaffolds/internal/templates/boilerplate.go
@@ -71,6 +71,8 @@ func (f *Boilerplate) SetTemplateDefaults() error {
 const apache = `/*
 {{ if .Owner -}}
 Copyright {{ .Year }} {{ .Owner }}.
+{{ else }}
+Copyright {{ .Year }}.
 {{- end }}
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,5 +91,7 @@ limitations under the License.
 const none = `/*
 {{ if .Owner -}}
 Copyright {{ .Year }} {{ .Owner }}.
+{{ else }}
+Copyright {{ .Year }}.
 {{- end }}
 */`
diff --git a/pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go b/pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go
@@ -71,6 +71,8 @@ func (f *Boilerplate) SetTemplateDefaults() error {
 const apache = `/*
 {{ if .Owner -}}
 Copyright {{ .Year }} {{ .Owner }}.
+{{ else }}
+Copyright {{ .Year }}.
 {{- end }}
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,5 +91,7 @@ limitations under the License.
 const none = `/*
 {{ if .Owner -}}
 Copyright {{ .Year }} {{ .Owner }}.
+{{ else }}
+Copyright {{ .Year }}.
 {{- end }}
 */`
diff --git a/testdata/project-v2-addon/api/v1/admiral_types.go b/testdata/project-v2-addon/api/v1/admiral_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/api/v1/captain_types.go b/testdata/project-v2-addon/api/v1/captain_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/api/v1/firstmate_types.go b/testdata/project-v2-addon/api/v1/firstmate_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/api/v1/groupversion_info.go b/testdata/project-v2-addon/api/v1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go b/testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-addon/controllers/admiral_controller.go b/testdata/project-v2-addon/controllers/admiral_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/controllers/captain_controller.go b/testdata/project-v2-addon/controllers/captain_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/controllers/firstmate_controller.go b/testdata/project-v2-addon/controllers/firstmate_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/controllers/suite_test.go b/testdata/project-v2-addon/controllers/suite_test.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/hack/boilerplate.go.txt b/testdata/project-v2-addon/hack/boilerplate.go.txt
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-addon/main.go b/testdata/project-v2-addon/main.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go b/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go b/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/crew/v1/groupversion_info.go b/testdata/project-v2-multigroup/apis/crew/v1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/groupversion_info.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v1/destroyer_webhook.go b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_webhook.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v1/groupversion_info.go b/testdata/project-v2-multigroup/apis/ship/v1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/groupversion_info.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_webhook.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_webhook.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/groupversion_info.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/groupversion_info.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go
diff --git a/testdata/project-v2-multigroup/controllers/crew/captain_controller.go b/testdata/project-v2-multigroup/controllers/crew/captain_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/crew/suite_test.go b/testdata/project-v2-multigroup/controllers/crew/suite_test.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go b/testdata/project-v2-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go b/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/kraken_controller.go b/testdata/project-v2-multigroup/controllers/sea-creatures/kraken_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/leviathan_controller.go b/testdata/project-v2-multigroup/controllers/sea-creatures/leviathan_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go b/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/ship/cruiser_controller.go b/testdata/project-v2-multigroup/controllers/ship/cruiser_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at

diff --git a/testdata/project-v2-multigroup/controllers/ship/destroyer_controller.go b/testdata/project-v2-multigroup/controllers/ship/destroyer_controller.go
@@ -1,6 +1,7 @@
 /*
 Copyright 2020 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.
 You may obtain a copy of the License at