Merge pull request kubernetes#18317 from spxtr/verify-flags

Auto commit by PR queue bot
nikhiljindal · Dec 8, 2015 · d568a92 · d568a92
2 parents be0d55c + ca35246
commit d568a92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/hack/verify-flags-underscore.py b/hack/verify-flags-underscore.py
@@ -67,10 +67,6 @@ def get_all_files(rootdir):
             files.remove('known-flags.txt')
 
         for name in files:
-            if name.endswith(".svg"):
-                continue
-            if name.endswith(".gliffy"):
-                continue
             pathname = os.path.join(root, name)
             if is_binary(pathname):
                 continue
@@ -87,6 +83,10 @@ def normalize_files(rootdir, files):
             continue
         if f.endswith(".gliffy"):
             continue
+        if f.endswith(".md"):
+            continue
+        if f.endswith(".yaml"):
+            continue
         newfiles.append(f)
     for i, f in enumerate(newfiles):
         if not os.path.isabs(f):
@@ -106,9 +106,6 @@ def line_has_bad_flag(line, flagre):
             return False
         if "grains" + result in line:
             return False
-        # These are usually yaml definitions
-        if result.endswith(":"):
-            return False
          # something common in juju variables...
         if "template_data[" + result + "]" in line:
             return False

diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt
@@ -1,11 +1,2 @@
-_output/release-stage/full/kubernetes/cluster/addons/registry/images/Dockerfile:ADD run_proxy.sh /usr/bin/run_proxy
-_output/release-stage/full/kubernetes/docs/admin/salt.md:`api_servers` | (Optional) The IP address / host name where a kubelet can get read-only access to kube-apiserver
-_output/release-stage/full/kubernetes/docs/admin/salt.md:`etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd.  Uses the IP of the first machine in the kubernetes_master role, or 127.0.0.1 on GCE.
-_output/release-stage/full/kubernetes/docs/admin/salt.md:`hostname_override` | (Optional) Mapped to the kubelet hostname-override
-_output/release-stage/full/kubernetes/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:var cloud_config = require('../cloud_config.js');
 cluster/addons/registry/images/Dockerfile:ADD run_proxy.sh /usr/bin/run_proxy
-docs/admin/salt.md:`api_servers` | (Optional) The IP address / host name where a kubelet can get read-only access to kube-apiserver
-docs/admin/salt.md:`etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd.  Uses the IP of the first machine in the kubernetes_master role, or 127.0.0.1 on GCE.
-docs/admin/salt.md:`hostname_override` | (Optional) Mapped to the kubelet hostname-override
 docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:var cloud_config = require('../cloud_config.js');
-hack/jenkins/README.md:[jenkins_jobs.ini](http://docs.openstack.org/infra/jenkins-job-builder/execution.html)