From eda7fbd16a882998839d5d7c6fbf12330e5ce4fb Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 6 Oct 2017 06:56:09 -0400 Subject: [PATCH] Ignore .import-restrictions when checking against generated docs --- hack/verify-generated-swagger-docs.sh | 2 +- pkg/controller/service/service_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/verify-generated-swagger-docs.sh b/hack/verify-generated-swagger-docs.sh index e787aae35bc..ef93c4e0613 100755 --- a/hack/verify-generated-swagger-docs.sh +++ b/hack/verify-generated-swagger-docs.sh @@ -55,7 +55,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}/" "${KUBE_ROOT}/hack/update-generated-swagger-docs.sh" echo "diffing ${DIFFROOT} against freshly generated swagger type documentation" ret=0 -diff -Naupr -I 'Auto generated by' "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? +diff --exclude=".import-restrictions" -Naupr -I 'Auto generated by' "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$? cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}/" if [[ $ret -eq 0 ]] then diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go index 569d409d69c..0f7c1f686b8 100644 --- a/pkg/controller/service/service_controller.go +++ b/pkg/controller/service/service_controller.go @@ -69,7 +69,7 @@ const ( // LabelNodeRoleExcludeBalancer specifies that the node should be // exclude from load balancers created by a cloud provider. - LabelNodeRoleExcludeBalancer = "node.role.kubernetes.io/exclude-balancer" + LabelNodeRoleExcludeBalancer = "alpha.node.role.kubernetes.io/exclude-balancer" ) type cachedService struct {