Clarifying what should happen when Gateway hostname is ""

Makefile

@@ -29,7 +29,7 @@ all: generate vet fmt verify test
 .PHONY: generate
 generate:
 	$(CONTROLLER_GEN) \
-		object:headerFile=./hack/boilerplate/boilerplate.go.txt,year=$$(date +%Y) \
+		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt,year=$$(date +%Y) \
 		crd:crdVersions=v1 \
 		output:crd:artifacts:config=config/crd/bases \
 		paths=./...

apis/v1alpha1/gateway_types.go

@@ -134,9 +134,9 @@ type GatewaySpec struct {
 // validating webhook.
 type Listener struct {
 	// Hostname specifies the virtual hostname to match for protocol types that
-	// define this concept. When unspecified or "*", all hostnames are matched.
-	// This field can be omitted for protocols that don't require hostname based
-	// matching.
+	// define this concept. When unspecified, "", or "*", all hostnames are
+	// matched. This field can be omitted for protocols that don't require
+	// hostname based matching.
 	//
 	// Hostname is the fully qualified domain name of a network host, as defined
 	// by RFC 3986. Note the following deviations from the "host" part of the

hack/boilerplate/boilerplate.generatego.txt

@@ -0,0 +1,15 @@
+/*
+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.
+*/

hack/boilerplate/boilerplate.py

@@ -14,17 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# This file is copied from https://github.com/kubernetes/kubernetes/blob/04c2b1fbdc1289c9a72eda87cf7072346e60d241/hack/boilerplate/boilerplate.py
+
 from __future__ import print_function
 
 import argparse
+import datetime
 import difflib
 import glob
-import json
-import mmap
 import os
 import re
 import sys
-from datetime import date
 
 parser = argparse.ArgumentParser()
 parser.add_argument(
@@ -65,6 +65,15 @@ def get_refs():
     return refs
 
 
+def is_generated_file(filename, data, regexs):
+    for d in skipped_ungenerated_files:
+        if d in filename:
+            return False
+
+    p = regexs["generated"]
+    return p.search(data)
+
+
 def file_passes(filename, refs, regexs):
     try:
         f = open(filename, 'r')
@@ -75,20 +84,27 @@ def file_passes(filename, refs, regexs):
     data = f.read()
     f.close()
 
+    # determine if the file is automatically generated
+    generated = is_generated_file(filename, data, regexs)
+
     basename = os.path.basename(filename)
     extension = file_extension(filename)
+    if generated:
+        if extension == "go":
+            extension = "generatego"
+        elif extension == "bzl":
+            extension = "generatebzl"
+
     if extension != "":
         ref = refs[extension]
     else:
         ref = refs[basename]
 
-    # remove build tags from the top of Go files
-    if extension == "go":
+    # remove extra content from the top of files
+    if extension == "go" or extension == "generatego":
         p = regexs["go_build_constraints"]
         (data, found) = p.subn("", data, 1)
-
-    # remove shebang from the top of shell files
-    if extension == "sh":
+    elif extension in ["sh", "py"]:
         p = regexs["shebang"]
         (data, found) = p.subn("", data, 1)
 
@@ -107,15 +123,21 @@ def file_passes(filename, refs, regexs):
     p = regexs["year"]
     for d in data:
         if p.search(d):
-            print('File %s is missing the year' % filename, file=verbose_out)
+            if generated:
+                print('File %s has the YEAR field, but it should not be in generated file' %
+                      filename, file=verbose_out)
+            else:
+                print('File %s has the YEAR field, but missing the year of date' %
+                      filename, file=verbose_out)
             return False
 
-    # Replace all occurrences of the regex "CURRENT_YEAR|...|2016|2015|2014" with "YEAR"
-    p = regexs["date"]
-    for i, d in enumerate(data):
-        (data[i], found) = p.subn('YEAR', d)
-        if found != 0:
-            break
+    if not generated:
+        # Replace all occurrences of the regex "2014|2015|2016|2017|2018" with "YEAR"
+        p = regexs["date"]
+        for i, d in enumerate(data):
+            (data[i], found) = p.subn('YEAR', d)
+            if found != 0:
+                break
 
     # if we don't match the reference at this point, fail
     if ref != data:
@@ -135,12 +157,13 @@ def file_extension(filename):
     return os.path.splitext(filename)[1].split(".")[-1].lower()
 
 
-skipped_dirs = [
-    '.git',
-    "vendor",
-    "test/e2e/framework/framework.go",
-    "images"
-]
+skipped_dirs = ['third_party', '_gopath', '_output', '.git', 'cluster/env.sh',
+                "vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test",
+                "staging/src/k8s.io/kubectl/pkg/generated/bindata.go"]
+
+# list all the files contain 'DO NOT EDIT', but are not generated
+skipped_ungenerated_files = [
+    'hack/lib/swagger.sh', 'hack/boilerplate/boilerplate.py']
 
 
 def normalize_files(files):
@@ -183,19 +206,25 @@ def get_files(extensions):
     return outfiles
 
 
+def get_dates():
+    years = datetime.datetime.now().year
+    return '(%s)' % '|'.join((str(year) for year in range(2014, years+1)))
+
+
 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 2014, 2015, 2016, ..., CURRENT_YEAR, company holder names can be anything
-    years = range(2014, date.today().year + 1)
-    regexs["date"] = re.compile(
-        '(%s)' % "|".join(map(lambda l: str(l), years)))
+    # get_dates return 2014, 2015, 2016, 2017, or 2018 until the current year as a regex like: "(2014|2015|2016|2017|2018)";
+    # company holder names can be anything
+    regexs["date"] = re.compile(get_dates())
     # strip // +build \n\n build constraints
     regexs["go_build_constraints"] = re.compile(
         r"^(// \+build.*\n)+\n", re.MULTILINE)
-    # strip #!.* from shell scripts
+    # strip #!.* from scripts
     regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
+    # Search for generated files
+    regexs["generated"] = re.compile('DO NOT EDIT')
     return regexs
 
 

hack/boilerplate/boilerplate.py.txt

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # Copyright YEAR The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,4 +11,3 @@
 # 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/update-codegen.sh

@@ -43,7 +43,7 @@ if [[ "${VERIFY_CODEGEN:-}" == "true" ]]; then
   readonly VERIFY_FLAG="--verify-only"
 fi
 
-readonly COMMON_FLAGS="${VERIFY_FLAG:-} --go-header-file ${SCRIPT_ROOT}/hack/boilerplate/boilerplate.go.txt"
+readonly COMMON_FLAGS="${VERIFY_FLAG:-} --go-header-file ${SCRIPT_ROOT}/hack/boilerplate/boilerplate.generatego.txt"
 
 echo "Generating deepcopy funcs"
 go run k8s.io/code-generator/cmd/deepcopy-gen \