From ee95008fcf270d88ce12b12bf79ad593c70a59c7 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 2 Mar 2016 13:01:41 -0700 Subject: [PATCH 1/2] fix(*): add more license headers --- rootfs/expandybird/Dockerfile | 13 +++++++++++++ rootfs/expandybird/Makefile | 13 +++++++++++++ rootfs/manager/Dockerfile | 13 +++++++++++++ rootfs/manager/Makefile | 13 +++++++++++++ rootfs/resourcifier/Dockerfile | 13 +++++++++++++ rootfs/resourcifier/Makefile | 13 +++++++++++++ 6 files changed, 78 insertions(+) diff --git a/rootfs/expandybird/Dockerfile b/rootfs/expandybird/Dockerfile index cea99a7cd..814303c76 100644 --- a/rootfs/expandybird/Dockerfile +++ b/rootfs/expandybird/Dockerfile @@ -1,3 +1,16 @@ +# 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. FROM alpine:3.3 COPY . / diff --git a/rootfs/expandybird/Makefile b/rootfs/expandybird/Makefile index e293f49af..a7baecf58 100644 --- a/rootfs/expandybird/Makefile +++ b/rootfs/expandybird/Makefile @@ -1,3 +1,16 @@ +# 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. DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE ?= expandybird diff --git a/rootfs/manager/Dockerfile b/rootfs/manager/Dockerfile index 55bbe6b67..79e292f51 100644 --- a/rootfs/manager/Dockerfile +++ b/rootfs/manager/Dockerfile @@ -1,3 +1,16 @@ +# 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. FROM alpine:3.3 COPY . / EXPOSE 8080 diff --git a/rootfs/manager/Makefile b/rootfs/manager/Makefile index 886ca837a..e116a491f 100644 --- a/rootfs/manager/Makefile +++ b/rootfs/manager/Makefile @@ -1,3 +1,16 @@ +# 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. DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE ?= manager diff --git a/rootfs/resourcifier/Dockerfile b/rootfs/resourcifier/Dockerfile index fca4437c3..a9309bdb0 100644 --- a/rootfs/resourcifier/Dockerfile +++ b/rootfs/resourcifier/Dockerfile @@ -1,3 +1,16 @@ +# 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. FROM alpine:3.3 COPY . / EXPOSE 8080 diff --git a/rootfs/resourcifier/Makefile b/rootfs/resourcifier/Makefile index 56a21da77..26a42b2e4 100644 --- a/rootfs/resourcifier/Makefile +++ b/rootfs/resourcifier/Makefile @@ -1,3 +1,16 @@ +# 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. DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE ?= resourcifier From 8cd0248cafefcaf3fa572bec2d2f6702224f4c88 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Wed, 2 Mar 2016 13:35:32 -0700 Subject: [PATCH 2/2] fix(*): add license header to Go files Closes #311. --- pkg/dm/client.go | 16 ++++++++++++++++ pkg/dm/client_test.go | 16 ++++++++++++++++ pkg/dm/install.go | 16 ++++++++++++++++ pkg/dm/transport.go | 16 ++++++++++++++++ pkg/dm/transport_test.go | 16 ++++++++++++++++ pkg/dm/uninstall.go | 16 ++++++++++++++++ pkg/kubectl/cluster_info.go | 16 ++++++++++++++++ pkg/kubectl/command.go | 16 ++++++++++++++++ pkg/kubectl/create.go | 16 ++++++++++++++++ pkg/kubectl/create_test.go | 16 ++++++++++++++++ pkg/kubectl/delete.go | 16 ++++++++++++++++ pkg/kubectl/get.go | 16 ++++++++++++++++ pkg/kubectl/get_test.go | 16 ++++++++++++++++ pkg/kubectl/kubectl.go | 16 ++++++++++++++++ pkg/kubectl/kubectl_test.go | 16 ++++++++++++++++ pkg/log/log.go | 16 ++++++++++++++++ pkg/log/log_test.go | 16 ++++++++++++++++ pkg/registry/registry_test.go | 16 ++++++++++++++++ 18 files changed, 288 insertions(+) diff --git a/pkg/dm/client.go b/pkg/dm/client.go index 17d207350..9b52f933b 100644 --- a/pkg/dm/client.go +++ b/pkg/dm/client.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 dm import ( diff --git a/pkg/dm/client_test.go b/pkg/dm/client_test.go index e35e99369..41942bf05 100644 --- a/pkg/dm/client_test.go +++ b/pkg/dm/client_test.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 dm import ( diff --git a/pkg/dm/install.go b/pkg/dm/install.go index 3edb95b4f..44e411c20 100644 --- a/pkg/dm/install.go +++ b/pkg/dm/install.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 dm import ( diff --git a/pkg/dm/transport.go b/pkg/dm/transport.go index 345cbfa61..2e1c4aa3c 100644 --- a/pkg/dm/transport.go +++ b/pkg/dm/transport.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 dm import ( diff --git a/pkg/dm/transport_test.go b/pkg/dm/transport_test.go index d563d3eab..de9f04477 100644 --- a/pkg/dm/transport_test.go +++ b/pkg/dm/transport_test.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 dm import ( diff --git a/pkg/dm/uninstall.go b/pkg/dm/uninstall.go index 0acc470cd..8b3224195 100644 --- a/pkg/dm/uninstall.go +++ b/pkg/dm/uninstall.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 dm import ( diff --git a/pkg/kubectl/cluster_info.go b/pkg/kubectl/cluster_info.go index 9449319c0..7bcebacb0 100644 --- a/pkg/kubectl/cluster_info.go +++ b/pkg/kubectl/cluster_info.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 kubectl // ClusterInfo returns Kubernetes cluster info diff --git a/pkg/kubectl/command.go b/pkg/kubectl/command.go index b36e0ad33..43d437135 100644 --- a/pkg/kubectl/command.go +++ b/pkg/kubectl/command.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 kubectl import ( diff --git a/pkg/kubectl/create.go b/pkg/kubectl/create.go index af9297aa9..379d4144b 100644 --- a/pkg/kubectl/create.go +++ b/pkg/kubectl/create.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 kubectl // Create uploads a chart to Kubernetes diff --git a/pkg/kubectl/create_test.go b/pkg/kubectl/create_test.go index bca94f6e5..078eab0a2 100644 --- a/pkg/kubectl/create_test.go +++ b/pkg/kubectl/create_test.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 kubectl import ( diff --git a/pkg/kubectl/delete.go b/pkg/kubectl/delete.go index 52874cfbb..71e57b0e6 100644 --- a/pkg/kubectl/delete.go +++ b/pkg/kubectl/delete.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 kubectl // Delete removes a chart from Kubernetes. diff --git a/pkg/kubectl/get.go b/pkg/kubectl/get.go index d80dd385d..ec5921dc5 100644 --- a/pkg/kubectl/get.go +++ b/pkg/kubectl/get.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 kubectl // Get returns Kubernetes resources diff --git a/pkg/kubectl/get_test.go b/pkg/kubectl/get_test.go index 532724a20..429ae5ebb 100644 --- a/pkg/kubectl/get_test.go +++ b/pkg/kubectl/get_test.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 kubectl import ( diff --git a/pkg/kubectl/kubectl.go b/pkg/kubectl/kubectl.go index a85ca6128..c83da8c39 100644 --- a/pkg/kubectl/kubectl.go +++ b/pkg/kubectl/kubectl.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 kubectl // Path is the path of the kubectl binary diff --git a/pkg/kubectl/kubectl_test.go b/pkg/kubectl/kubectl_test.go index 453667330..f4625330c 100644 --- a/pkg/kubectl/kubectl_test.go +++ b/pkg/kubectl/kubectl_test.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 kubectl type TestRunner struct { diff --git a/pkg/log/log.go b/pkg/log/log.go index c2f4ff5f7..269659cb0 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.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 log provides simple convenience wrappers for logging. diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go index 3a10b8d2a..9d8a03a0a 100644 --- a/pkg/log/log_test.go +++ b/pkg/log/log_test.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 log import ( diff --git a/pkg/registry/registry_test.go b/pkg/registry/registry_test.go index 0def91259..3879fd37d 100644 --- a/pkg/registry/registry_test.go +++ b/pkg/registry/registry_test.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 registry import (