Merge pull request #255 from SergeyKanzhelev/removeYear

removed year from boilerplates, allow 2014-2025 years in existing cop…

Author: k8s-ci-robot

hack/verify_boilerplate.py

@@ -76,12 +76,6 @@ def get_refs():
 
     return refs
 
-# given the file contents, return true if the file appears to be generated
-def is_generated(data):
-    if re.search(r"^// Code generated by .*\. DO NOT EDIT\.$", data, re.MULTILINE):
-        return True
-    return False
-
 
 def file_passes(filename, refs, regexs):  # pylint: disable=too-many-locals
     try:
@@ -123,22 +117,10 @@ def file_passes(filename, refs, regexs):  # pylint: disable=too-many-locals
     # trim our file to the same number of lines as the reference file
     data = data[:len(ref)]
 
-    # check if we encounter a 'YEAR' placeholder if the file is generated
-    if is_generated(file_data):
-        for i, line in enumerate(data):
-            if "Copyright YEAR" in line:
-                return False
-        return True
-
-    year = regexs["year"]
-    for datum in data:
-        if year.search(datum):
-            return False
-
-    # Replace all occurrences of the regex "2017|2016|2015|2014" with "YEAR"
+    # Replace all occurrences of the regex "Copyright 2017 |Copyright " with "Copyright "
     when = regexs["date"]
     for idx, datum in enumerate(data):
-        (data[idx], found) = when.subn('YEAR', datum)
+        (data[idx], found) = when.subn('Copyright ', datum)
         if found != 0:
             break
 
@@ -211,16 +193,13 @@ def get_files(extensions):
 
 
 def get_dates():
-    years = datetime.datetime.now().year
-    return '(%s)' % '|'.join((str(year) for year in range(2014, years + 1)))
+    return '((201[4-9]|202[0-5]) )?'
 
 
 def get_regexs():
     regexs = {}
-    # Search for "YEAR" which exists in the boilerplate, but shouldn't in the real thing
-    regexs["year"] = re.compile('YEAR')
-    # dates can be any year between 2014 and the current year, company holder names can be anything
-    regexs["date"] = re.compile(get_dates())
+    # dates can be any year between 2014 and 2025, company holder names can be anything
+    regexs["date"] = re.compile(r'Copyright ' + get_dates())
     # strip // +build \n\n build constraints
     regexs["go_build_constraints"] = re.compile(r"^(//( \+build|go:build).*\n)+\n",
                                                 re.MULTILINE)

hack/verify_boilerplate_test.py

@@ -53,6 +53,7 @@ def __init__(self):
     expected = '\n'.join(verify_boilerplate.nonconforming_lines([
         './fail.go',
         './fail.py',
+        './fail_2026.go',
     ])) + '\n' # add trailing newline
 
     self.assertEqual(output, expected)

verify/boilerplate/boilerplate.Dockerfile.txt

@@ -1,4 +1,4 @@
-# Copyright YEAR The Kubernetes Authors.
+# Copyright 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.

verify/boilerplate/boilerplate.Makefile.txt

@@ -1,4 +1,4 @@
-# Copyright YEAR The Kubernetes Authors.
+# Copyright 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.

verify/boilerplate/boilerplate.bzl.txt

@@ -1,4 +1,4 @@
-# Copyright YEAR The Kubernetes Authors.
+# Copyright 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.

verify/boilerplate/boilerplate.go.txt

@@ -1,5 +1,5 @@
 /*
-Copyright YEAR The Kubernetes Authors.
+Copyright 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.

verify/boilerplate/boilerplate.py.txt

@@ -1,4 +1,4 @@
-# Copyright YEAR The Kubernetes Authors.
+# Copyright 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.

verify/boilerplate/boilerplate.sh.txt

@@ -1,4 +1,4 @@
-# Copyright YEAR The Kubernetes Authors.
+# Copyright 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.

verify/boilerplate/test/fail_2026.go

@@ -0,0 +1,17 @@
+/*
+Copyright 2026 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 test

verify/boilerplate/test/pass_no_year.go

@@ -0,0 +1,17 @@
+/*
+Copyright 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 test