Merge pull request #6364 from mikesplain/automated-cherry-pick-of-#62…

…88-origin-release-1.11 Automated cherry pick of #6288: Recognize 2019 as a year
kubernetes · Feb 28, 2019 · 0dfa51e · 0dfa51e
2 parents 3ac5299 + 3d54c0a
commit 0dfa51e
Show file tree

Hide file tree

Showing 96 changed files with 96 additions and 96 deletions.
diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py
@@ -176,7 +176,7 @@ def get_regexs():
     # Search for "YEAR" which exists in the boilerplate, but shouldn't in the real thing
     regexs["year"] = re.compile( 'YEAR' )
     # dates can be 2014, 2015, 2016, or 2017; company holder names can be anything
-    regexs["date"] = re.compile( '(2014|2015|2016|2017|2018)' )
+    regexs["date"] = re.compile( '(2014|2015|2016|2017|2018|2019|2020|2021|2022)' )
     # strip // +build \n\n build constraints
     regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
     # strip #!.* from shell scripts

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha1/zz_generated.defaults.go b/pkg/apis/kops/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.defaults.go b/pkg/apis/kops/v1alpha2/zz_generated.defaults.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go
diff --git a/pkg/client/clientset_generated/clientset/doc.go b/pkg/client/clientset_generated/clientset/doc.go
diff --git a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
diff --git a/pkg/client/clientset_generated/clientset/fake/doc.go b/pkg/client/clientset_generated/clientset/fake/doc.go
diff --git a/pkg/client/clientset_generated/clientset/fake/register.go b/pkg/client/clientset_generated/clientset/fake/register.go
diff --git a/pkg/client/clientset_generated/clientset/scheme/doc.go b/pkg/client/clientset_generated/clientset/scheme/doc.go
diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/cluster.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/doc.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/doc.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/doc.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_cluster.go
diff --git a/...lient/clientset_generated/clientset/typed/kops/internalversion/fake/fake_instancegroup.go b/...lient/clientset_generated/clientset/typed/kops/internalversion/fake/fake_instancegroup.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_keyset.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_keyset.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_kops_client.go
diff --git a/...lient/clientset_generated/clientset/typed/kops/internalversion/fake/fake_sshcredential.go b/...lient/clientset_generated/clientset/typed/kops/internalversion/fake/fake_sshcredential.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/generated_expansion.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/generated_expansion.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/instancegroup.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/keyset.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/keyset.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/kops_client.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/sshcredential.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/cluster.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/doc.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/doc.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/doc.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_cluster.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_instancegroup.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_kops_client.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_sshcredential.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/generated_expansion.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/generated_expansion.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/instancegroup.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/kops_client.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/sshcredential.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/cluster.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/doc.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/doc.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/doc.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/doc.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_cluster.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_instancegroup.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_keyset.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_keyset.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_kops_client.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_sshcredential.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/generated_expansion.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/generated_expansion.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/instancegroup.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/keyset.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/keyset.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/kops_client.go
diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/sshcredential.go
diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go
diff --git a/pkg/client/clientset_generated/internalclientset/doc.go b/pkg/client/clientset_generated/internalclientset/doc.go