From 00331589a362d519ad1fa80f3acdbe42d6317f65 Mon Sep 17 00:00:00 2001 From: sebgoa Date: Tue, 1 Nov 2016 14:42:38 +0100 Subject: [PATCH] Fix license headers, This closes #223 --- cli/app/app.go | 2 +- cli/app/app_test.go | 2 +- cli/command/command.go | 2 +- main.go | 2 +- pkg/kobject/kobject.go | 2 +- pkg/loader/bundle/bundle.go | 2 +- pkg/loader/compose/compose.go | 2 +- pkg/loader/loader.go | 2 +- pkg/transformer/kubernetes/k8sutils.go | 2 +- pkg/transformer/kubernetes/kubernetes.go | 2 +- pkg/transformer/kubernetes/kubernetes_test.go | 2 +- pkg/transformer/openshift/openshift.go | 2 +- pkg/transformer/transformer.go | 2 +- pkg/transformer/utils.go | 16 ++++++++++++++++ script/.build | 14 ++++++++++++++ script/.validate | 14 ++++++++++++++ script/bash_autocomplete | 14 ++++++++++++++ script/binary | 15 +++++++++++++++ script/binary-cross | 15 +++++++++++++++ script/godep-restore.sh | 14 ++++++++++++++ script/make.sh | 15 +++++++++++++++ script/test-cmd | 14 ++++++++++++++ script/test-unit | 15 +++++++++++++++ script/test/cmd/globals.sh | 14 ++++++++++++++ script/test/cmd/lib.sh | 14 ++++++++++++++ script/test/cmd/tests.sh | 14 ++++++++++++++ script/validate-git-marks | 14 ++++++++++++++ script/validate-gofmt | 14 ++++++++++++++ script/validate-lint | 14 ++++++++++++++ script/validate-vet | 14 ++++++++++++++ version/version.go | 2 +- 31 files changed, 258 insertions(+), 14 deletions(-) diff --git a/cli/app/app.go b/cli/app/app.go index 835eb327..5c046b9b 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/cli/app/app_test.go b/cli/app/app_test.go index d2548b87..03518858 100644 --- a/cli/app/app_test.go +++ b/cli/app/app_test.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved 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/cli/command/command.go b/cli/command/command.go index a3cc5420..e487f5ab 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/main.go b/main.go index bcea4ca4..c3ef520c 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/kobject/kobject.go b/pkg/kobject/kobject.go index 66885c9e..1789fb60 100644 --- a/pkg/kobject/kobject.go +++ b/pkg/kobject/kobject.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/loader/bundle/bundle.go b/pkg/loader/bundle/bundle.go index 7acec22d..80202133 100644 --- a/pkg/loader/bundle/bundle.go +++ b/pkg/loader/bundle/bundle.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index b118e5a2..9e138c66 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/loader/loader.go b/pkg/loader/loader.go index 4df7da85..eff70f0e 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index 685389ee..f9dedcbe 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index f1ddd75e..9aac7a85 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/transformer/kubernetes/kubernetes_test.go b/pkg/transformer/kubernetes/kubernetes_test.go index 06ff96f0..8e52a5d0 100644 --- a/pkg/transformer/kubernetes/kubernetes_test.go +++ b/pkg/transformer/kubernetes/kubernetes_test.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index c45e24b6..20f18d63 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/transformer/transformer.go b/pkg/transformer/transformer.go index c2b08db2..c5d484b2 100644 --- a/pkg/transformer/transformer.go +++ b/pkg/transformer/transformer.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. 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/pkg/transformer/utils.go b/pkg/transformer/utils.go index edc4ca67..f64473ad 100644 --- a/pkg/transformer/utils.go +++ b/pkg/transformer/utils.go @@ -1,3 +1,19 @@ +/* +Copyright 2016 The Kubernetes Authors All rights reserved. + +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 transformer import ( diff --git a/script/.build b/script/.build index ca655a6e..0c0de213 100644 --- a/script/.build +++ b/script/.build @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + GITCOMMIT=$(git rev-parse --short HEAD) BUILD_FLAGS=(-ldflags="-w -X github.com/kubernetes-incubator/kompose/version.GITCOMMIT=${GITCOMMIT}") diff --git a/script/.validate b/script/.validate index 2d2645f5..319052e5 100644 --- a/script/.validate +++ b/script/.validate @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + if [ -z "$VALIDATE_UPSTREAM" ]; then # this is kind of an expensive check, so let's not do this twice if we # are running more than one validate bundlescript diff --git a/script/bash_autocomplete b/script/bash_autocomplete index 21a232f1..3af2531d 100644 --- a/script/bash_autocomplete +++ b/script/bash_autocomplete @@ -1,5 +1,19 @@ #! /bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + : ${PROG:=$(basename ${BASH_SOURCE})} _cli_bash_autocomplete() { diff --git a/script/binary b/script/binary index 713caee2..08fbab54 100755 --- a/script/binary +++ b/script/binary @@ -1,4 +1,19 @@ #!/bin/bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + set -e source "$(dirname "$BASH_SOURCE")/.build" diff --git a/script/binary-cross b/script/binary-cross index 13208a27..761d912b 100644 --- a/script/binary-cross +++ b/script/binary-cross @@ -1,4 +1,19 @@ #!/bin/bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + set -e source "$(dirname "$BASH_SOURCE")/.build" diff --git a/script/godep-restore.sh b/script/godep-restore.sh index a2dbff2c..08ea3cdb 100755 --- a/script/godep-restore.sh +++ b/script/godep-restore.sh @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + # inspired by: https://github.com/openshift/origin/blob/master/hack/godep-restore.sh # Sometimes godep needs 'other' remotes. So add those remotes diff --git a/script/make.sh b/script/make.sh index 323f90cf..fdfc6200 100755 --- a/script/make.sh +++ b/script/make.sh @@ -1,4 +1,19 @@ #!/usr/bin/env bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + set -e export KOMPOSE_PKG='github.com/kubernetes-incubator/kompose' diff --git a/script/test-cmd b/script/test-cmd index a04691ef..fd2b1d00 100755 --- a/script/test-cmd +++ b/script/test-cmd @@ -1,3 +1,17 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + ./script/test/cmd/tests.sh diff --git a/script/test-unit b/script/test-unit index 1fe66ce8..8349dc7e 100755 --- a/script/test-unit +++ b/script/test-unit @@ -1,4 +1,19 @@ #!/bin/bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + set -e source "$(dirname "$BASH_SOURCE")/.build" diff --git a/script/test/cmd/globals.sh b/script/test/cmd/globals.sh index a029847d..8534ec4b 100644 --- a/script/test/cmd/globals.sh +++ b/script/test/cmd/globals.sh @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + TEMP_DIR="/tmp/kompose" TEMP_STDOUT=$TEMP_DIR/test-stdout TEMP_STDERR=$TEMP_DIR/test-stderr diff --git a/script/test/cmd/lib.sh b/script/test/cmd/lib.sh index 83b7dac3..f2d7e626 100644 --- a/script/test/cmd/lib.sh +++ b/script/test/cmd/lib.sh @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + KOMPOSE_ROOT=$(readlink -f $(dirname "${BASH_SOURCE}")/../../..) source $KOMPOSE_ROOT/script/test/cmd/globals.sh diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index 8489ca8d..71654471 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + KOMPOSE_ROOT=$(readlink -f $(dirname "${BASH_SOURCE}")/../../..) source $KOMPOSE_ROOT/script/test/cmd/lib.sh diff --git a/script/validate-git-marks b/script/validate-git-marks index daa6950e..9397e24e 100755 --- a/script/validate-git-marks +++ b/script/validate-git-marks @@ -1,5 +1,19 @@ #!/usr/bin/env bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + source "$(dirname "$BASH_SOURCE")/.validate" # folders=$(find * -type d | egrep -v '^Godeps|bundles|.git') diff --git a/script/validate-gofmt b/script/validate-gofmt index 8fc88cc5..0c4de39e 100755 --- a/script/validate-gofmt +++ b/script/validate-gofmt @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' diff --git a/script/validate-lint b/script/validate-lint index f8cb9c9f..fbd11427 100755 --- a/script/validate-lint +++ b/script/validate-lint @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + source "$(dirname "$BASH_SOURCE")/.validate" # We will eventually get to the point where packages should be the complete list diff --git a/script/validate-vet b/script/validate-vet index e88f7549..d5586084 100755 --- a/script/validate-vet +++ b/script/validate-vet @@ -1,5 +1,19 @@ #!/bin/bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# 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. + source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' diff --git a/version/version.go b/version/version.go index 0bce8f71..7e4411e3 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ /* -Copyright 2016 Skippbox, Ltd All rights reserved. +Copyright 2016 The Kubernetes Authors All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.