Merge pull request #20545 from pmorie/boilerplate

Auto commit by PR queue bot

hack/boilerplate/boilerplate.Dockerfile.txt

@@ -0,0 +1,14 @@
+# Copyright YEAR 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.
+

hack/boilerplate/boilerplate.Makefile.txt

@@ -0,0 +1,14 @@
+# Copyright YEAR 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.
+

hack/boilerplate/boilerplate.py

@@ -33,6 +33,7 @@ rootdir = os.path.abspath(rootdir)
 
 def get_refs():
     refs = {}
+
     for path in glob.glob(os.path.join(rootdir, "hack/boilerplate/boilerplate.*.txt")):
         extension = os.path.basename(path).split(".")[1]
 
@@ -52,8 +53,12 @@ def file_passes(filename, refs, regexs):
     data = f.read()
     f.close()
 
+    basename = os.path.basename(filename)
     extension = file_extension(filename)
-    ref = refs[extension]
+    if extension != "":
+        ref = refs[extension]
+    else:
+        ref = refs[basename]
 
     # remove build tags from the top of Go files
     if extension == "go":
@@ -128,8 +133,9 @@ def get_files(extensions):
     files = normalize_files(files)
     outfiles = []
     for pathname in files:
+        basename = os.path.basename(pathname)
         extension = file_extension(pathname)
-        if extension in extensions:
+        if extension in extensions or basename in extensions:
             outfiles.append(pathname)
     return outfiles
 

hack/gen-swagger-doc/Dockerfile

@@ -1,3 +1,17 @@
+# 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 java:7-jre
 
 RUN apt-get update

hack/jenkins/job-builder-image/Dockerfile

@@ -1,3 +1,17 @@
+# 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.
+
 # This docker image runs Jenkins Job Builder (JJB) for automatic job reconciliation.
 
 FROM ubuntu:14.04

hack/jenkins/job-builder-image/Makefile

@@ -1,3 +1,17 @@
+# 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.
+
 TAG = 1
 
 all:

hack/jenkins/test-image/Makefile

@@ -1,3 +1,17 @@
+# 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.
+
 all: push
 
 TAG = 0.7