scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 18:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore .import-restrictions when checking against generated docs

Browse Source
This commit is contained in:
Davanum Srinivas
2017-10-06 06:56:09 -04:00
parent 21fdd1c5ed
commit eda7fbd16a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/verify-generated-swagger-docs.sh
View File

@@ -55,7 +55,7 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}/"
"${KUBE_ROOT}/hack/update-generated-swagger-docs.sh" "${KUBE_ROOT}/hack/update-generated-swagger-docs.sh"
echo "diffing ${DIFFROOT} against freshly generated swagger type documentation" echo "diffing ${DIFFROOT} against freshly generated swagger type documentation"
ret=0 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}/" cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}/"
if [[ $ret -eq 0 ]] if [[ $ret -eq 0 ]]
then then

2
pkg/controller/service/service_controller.go
View File

@@ -69,7 +69,7 @@ const (
// LabelNodeRoleExcludeBalancer specifies that the node should be // LabelNodeRoleExcludeBalancer specifies that the node should be
// exclude from load balancers created by a cloud provider. // 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 { type cachedService struct {