Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 03f4e52

Browse files
committed
Make verify-flags-underscore.py return error on failure
We were running it in shippable and travis, but since it didn't return an error it wasn't actually catching things.
1 parent a945785 commit 03f4e52

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

examples/mysql-wordpress-pd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ Now, we can visit the running WordPress app.
330330
Use the external IP that you obtained above, and visit it on port 80:
331331

332332
```
333-
http://<external_ip>
333+
http://<external-ip>
334334
```
335335

336336
You should see the familiar WordPress init page.

hack/verify-flags-underscore.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ def main():
236236
bad_lines.sort()
237237
for (relname, line) in bad_lines:
238238
print("%s:%s" % (relname, line))
239+
return 1
239240

240241
if __name__ == "__main__":
241242
sys.exit(main())

hack/verify-flags/exceptions.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
cluster/addons/cluster-monitoring/README.md:Heapster enables monitoring of Kubernetes Clusters using [cAdvisor](https://github.com/google/cadvisor). The kubelet will communicate with an instance of cAdvisor running on localhost and proxy container stats to Heapster. Kubelet will attempt to connect to cAdvisor on port 4194 by default but this port can be configured with kubelet's `-cadvisor_port` run flag. Detailed information about heapster can be found [here](https://github.com/GoogleCloudPlatform/heapster).
2+
cluster/addons/registry/images/Dockerfile:ADD run_proxy.sh /usr/bin/run_proxy
3+
cluster/addons/registry/images/Dockerfile:CMD ["/usr/bin/run_proxy"]
24
cluster/aws/templates/salt-minion.sh:# We set the hostname_override to the full EC2 private dns name
35
cluster/gce/coreos/helper.sh:# cloud_config yaml file should be passed
46
cluster/juju/charms/trusty/kubernetes-master/files/controller-manager.upstart.tmpl: --address=%(bind_address)s \
@@ -32,8 +34,7 @@ cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: api
3234
cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: api_servers = get_rel_hosts('api', rels, ('hostname', 'port'))
3335
cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: etcd_servers = get_rel_hosts('etcd', rels, ('hostname', 'port'))
3436
cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: for k in ('etcd_servers', 'kubeapi_server'):
35-
cluster/libvirt-coreos/util.sh: public_ip=$MASTER_IP
36-
cluster/libvirt-coreos/util.sh: public_ip=${MINION_IPS[$i]}
37+
cluster/mesos/docker/common/bin/util-ssl.sh: local cluster_domain="cluster.local"
3738
cluster/saltbase/salt/kube-addons/kube-addons.sh:# Create admission_control objects if defined before any other addon services. If the limits
3839
cluster/saltbase/salt/kube-admission-controls/init.sls:{% if 'LimitRanger' in pillar.get('admission_control', '') %}
3940
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest:{% set params = address + " " + etcd_servers + " " + cloud_provider + " " + cloud_config + " " + runtime_config + " " + admission_control + " " + service_cluster_ip_range + " " + client_ca_file + " " + basic_auth_file + " " + min_request_timeout -%}
@@ -80,3 +81,7 @@ pkg/util/oom/oom_linux.go:// Writes 'value' to /proc/<pid>/oom_score_adj. PID =
8081
test/e2e/es_cluster_logging.go: Failf("No cluster_name field in Elasticsearch response: %v", esResponse)
8182
test/e2e/es_cluster_logging.go: // Check to see if have a cluster_name field.
8283
test/e2e/es_cluster_logging.go: clusterName, ok := esResponse["cluster_name"]
84+
test/e2e/host_path.go: fmt.Sprintf("--file_content_in_loop=%v", filePath),
85+
test/e2e/host_path.go: fmt.Sprintf("--retry_time=%d", retryDuration),
86+
test/images/mount-tester/mt.go: flag.IntVar(&retryDuration, "retry_time", 180, "Retry time during the loop")
87+
test/images/mount-tester/mt.go: flag.StringVar(&readFileContentInLoopPath, "file_content_in_loop", "", "Path to read the file content in loop from")

0 commit comments

Comments
 (0)