Merge pull request #17923 from yuvipanda/kube2dns-pflag

Auto commit by PR queue bot

hack/verify-flags/exceptions.txt

@@ -45,7 +45,8 @@ cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed:    api_ser
 cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed:    etcd_servers = get_rel_hosts('etcd', rels, ('hostname', 'port'))
 cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed:    for k in ('etcd_servers', 'kubeapi_server'):
 cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed:    if api_servers:
-cluster/mesos/docker/common/bin/util-ssl.sh:  local cluster_domain="cluster.local"
+cluster/lib/logging.sh:      local source_file=${BASH_SOURCE[$frame_no]}
+cluster/lib/logging.sh:  local source_file=${BASH_SOURCE[$stack_skip]}
 cluster/mesos/docker/km/build.sh:  km_path=$(find-binary km darwin/amd64)
 cluster/rackspace/util.sh:    local node_ip=$(nova show --minimal ${NODE_NAMES[$i]} \
 cluster/saltbase/salt/kube-addons/kube-addons.sh:# Create admission_control objects if defined before any other addon services. If the limits
@@ -75,6 +76,7 @@ docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:  re
 docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:  return cloud_config.process_template(input_file, output_file, function(data) {
 docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:  var write_files_extra = cloud_config.write_files_from('addons', '/etc/kubernetes/addons');
 docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:var cloud_config = require('../cloud_config.js');
+docs/getting-started-guides/docker-multinode/skydns-rc.yaml.in:        - -kube_master_url=http://{kube_server_url}:8080
 examples/cluster-dns/images/frontend/client.py:  service_address = socket.gethostbyname(hostname)
 examples/vitess/env.sh:    node_ip=$(get_node_ip)
 hack/jenkins/e2e.sh:  local -r cluster_name="$3"
@@ -84,8 +86,6 @@ hack/jenkins/update-jobs.sh:    docker cp jenkins_jobs.ini job-builder:/etc/jenk
 hack/jenkins/update-jobs.sh:    echo "jenkins_jobs.ini not found in workspace" >&2
 hack/jenkins/update-jobs.sh:  # jenkins_jobs.ini contains administrative credentials for Jenkins.
 hack/jenkins/update-jobs.sh:  if [[ -e jenkins_jobs.ini ]]; then
-cluster/lib/logging.sh:      local source_file=${BASH_SOURCE[$frame_no]}
-cluster/lib/logging.sh:  local source_file=${BASH_SOURCE[$stack_skip]}
 hack/local-up-cluster.sh:      runtime_config="--runtime-config=${RUNTIME_CONFIG}"
 hack/local-up-cluster.sh:    runtime_config=""
 hack/test-cmd.sh:  --runtime_config="extensions/v1beta1/deployments=true" \

hack/verify-flags/excluded-flags.txt

@@ -1,6 +1,5 @@
 check_version_skew
 concurrent_rc_syncs
-etcd_mutation_timeout
 file_content
 file_mode
 file_owner
@@ -8,8 +7,6 @@ file_perm
 fs_type
 gke_context
 host_port_endpoints
-kubecfg_file
-kube_master_url
 max_in_flight
 max_par
 new_file_0644

hack/verify-flags/known-flags.txt

@@ -88,6 +88,7 @@ enable-debugging-handlers
 enable-hostpath-provisioner
 enable-server
 etcd-config
+etcd-mutation-timeout
 etcd-prefix
 etcd-server
 etcd-servers
@@ -157,6 +158,7 @@ kube-api-burst
 kube-api-qps
 kube-master
 kube-reserved
+kubecfg-file
 kubectl-path
 kubelet-address
 kubelet-cadvisor-port
@@ -174,6 +176,8 @@ kubelet-read-only-port
 kubelet-root-dir
 kubelet-sync-frequency
 kubelet-timeout
+kube-master
+kube-master-url
 kubernetes-service-node-port
 label-columns
 last-release-pr