From 23d371ec37d92ed3c2ff163ed09bb15b206c3915 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 22 Jun 2018 21:32:49 -0400 Subject: [PATCH 1/4] Fix header for cmd/ --- cmd/internal/codegen/parse/parser_test.go | 1 + cmd/kubebuilder/create/config/config.go | 28 ++++++++++++----------- cmd/kubebuilder/docs/gen.go | 16 +++++++++++++ 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/cmd/internal/codegen/parse/parser_test.go b/cmd/internal/codegen/parse/parser_test.go index 0f0375534d..9d4b4098a2 100644 --- a/cmd/internal/codegen/parse/parser_test.go +++ b/cmd/internal/codegen/parse/parser_test.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package parse import ( diff --git a/cmd/kubebuilder/create/config/config.go b/cmd/kubebuilder/create/config/config.go index ecec4456dd..8bdca3a5c8 100644 --- a/cmd/kubebuilder/create/config/config.go +++ b/cmd/kubebuilder/create/config/config.go @@ -1,16 +1,18 @@ -// Copyright © 2018 NAME HERE -// -// 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 -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* +Copyright 2018 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 + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package config diff --git a/cmd/kubebuilder/docs/gen.go b/cmd/kubebuilder/docs/gen.go index e911f15acd..cfb27f8872 100644 --- a/cmd/kubebuilder/docs/gen.go +++ b/cmd/kubebuilder/docs/gen.go @@ -1,3 +1,19 @@ +/* +Copyright 2018 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 + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + package docs import ( From 0671f9fdc686828c1a252b82e5ccbb68d59174fc Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 22 Jun 2018 21:37:29 -0400 Subject: [PATCH 2/4] Fix headers for pkg/ --- pkg/signals/signal.go | 3 +++ pkg/signals/signal_posix.go | 3 +++ pkg/signals/signal_windows.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkg/signals/signal.go b/pkg/signals/signal.go index 61f44717c4..6bddfddb4f 100644 --- a/pkg/signals/signal.go +++ b/pkg/signals/signal.go @@ -1,9 +1,12 @@ /* Copyright 2017 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 + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pkg/signals/signal_posix.go b/pkg/signals/signal_posix.go index 81fe1739cd..9bdb4e7418 100644 --- a/pkg/signals/signal_posix.go +++ b/pkg/signals/signal_posix.go @@ -2,10 +2,13 @@ /* Copyright 2017 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 + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pkg/signals/signal_windows.go b/pkg/signals/signal_windows.go index 72a5650a9f..4907d573fe 100644 --- a/pkg/signals/signal_windows.go +++ b/pkg/signals/signal_windows.go @@ -1,9 +1,12 @@ /* Copyright 2017 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 + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. From 8ae5a45d8138b6f46e0b384cb45a27ec8245e9b1 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 22 Jun 2018 21:48:18 -0400 Subject: [PATCH 3/4] Fix headers for build/ Excluding build/thirdparty/ for now --- build/build_kubebuilder.sh | 21 ++++++++++----------- build/gitbook/Dockerfile | 20 ++++++++++---------- build/package.sh | 23 +++++++++++------------ build/test.sh | 21 ++++++++++----------- 4 files changed, 41 insertions(+), 44 deletions(-) diff --git a/build/build_kubebuilder.sh b/build/build_kubebuilder.sh index 5b436491dd..068a259310 100644 --- a/build/build_kubebuilder.sh +++ b/build/build_kubebuilder.sh @@ -1,18 +1,17 @@ #!/bin/bash +# Copyright 2018 The Kubernetes Authors. # -# Copyright 2018 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 # -# 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 +# http://www.apache.org/licenses/LICENSE-2.0 # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. set -e set -x diff --git a/build/gitbook/Dockerfile b/build/gitbook/Dockerfile index 0f55cc64d7..e6a902536a 100644 --- a/build/gitbook/Dockerfile +++ b/build/gitbook/Dockerfile @@ -1,16 +1,16 @@ -# Copyright 2018 The Kubernetes Authors. +# Copyright 2018 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 +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. FROM node:6 diff --git a/build/package.sh b/build/package.sh index 626aff3aa2..cf8743d0ca 100644 --- a/build/package.sh +++ b/build/package.sh @@ -1,21 +1,20 @@ #!/bin/bash +# Copyright 2018 The Kubernetes Authors. # -# Copyright 2018 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 # -# 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 +# http://www.apache.org/licenses/LICENSE-2.0 # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. set -e set -x cd /workspace/_output/ -tar -czvf /workspace/kubebuilder-$VERSION-$GOOS-$GOARCH.tar.gz kubebuilder \ No newline at end of file +tar -czvf /workspace/kubebuilder-$VERSION-$GOOS-$GOARCH.tar.gz kubebuilder diff --git a/build/test.sh b/build/test.sh index 7c22824829..521bfa8a9c 100755 --- a/build/test.sh +++ b/build/test.sh @@ -1,18 +1,17 @@ #!/usr/bin/env bash - -# Copyright 2018 The Kubernetes Authors. +# Copyright 2018 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 +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. cp -r /workspace/_output/kubebuilder /tmp/kubebuilder/ From 6635d58864df21bcfd3217a046ec44c33efab097 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 22 Jun 2018 21:53:52 -0400 Subject: [PATCH 4/4] Fix headers on root scripts --- test.sh | 21 ++++++++++----------- test_existing_projects.sh | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/test.sh b/test.sh index baa781d364..8a1c8a0524 100755 --- a/test.sh +++ b/test.sh @@ -1,18 +1,17 @@ #!/usr/bin/env bash - -# Copyright 2018 The Kubernetes Authors. +# Copyright 2018 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 +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. set -e diff --git a/test_existing_projects.sh b/test_existing_projects.sh index c05a8e14b5..1b2934cdd6 100755 --- a/test_existing_projects.sh +++ b/test_existing_projects.sh @@ -1,18 +1,17 @@ #!/usr/bin/env bash - -# Copyright 2018 The Kubernetes Authors. +# Copyright 2018 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 +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. for p in ./test/projects/* do