From 3b29b6a9efe0a534e26ff9ba6a86380725241241 Mon Sep 17 00:00:00 2001 From: Matt Bruzek Date: Fri, 10 Feb 2017 12:06:07 -0600 Subject: [PATCH] Lint fixes for the master and worker Python code. --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 7 +++++-- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 2 +- hack/verify-flags/exceptions.txt | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 8316e2d17f0..50b7203ebf6 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -185,7 +185,10 @@ def idle_status(): if not all_kube_system_pods_running(): hookenv.status_set('waiting', 'Waiting for kube-system pods to start') elif hookenv.config('service-cidr') != service_cidr(): - hookenv.status_set('active', 'WARN: cannot change service-cidr, still using ' + service_cidr()) + msg = "Cannot change {0} to {1}".format(service_cidr(), + hookenv.config('service-cidr')) + hookenv.log(msg, level=hookenv.WARN) + hookenv.status_set('active', msg) else: hookenv.status_set('active', 'Kubernetes master running.') @@ -302,7 +305,7 @@ def start_kube_dns(): context = { 'arch': arch(), - # The dictionary named 'pillar' is a construct of the k8s template files. + # The dictionary named pillar is a construct of the k8s template files. 'pillar': { 'dns_server': get_dns_ip(), 'dns_replicas': 1, diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 43c4f730bc7..e8115602409 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -165,7 +165,7 @@ def start_worker(kube_api, kube_dns, cni): opts = FlagManager('kubelet') # Append the DNS flags + data to the FlagManager object. - opts.add('--cluster-dns', dns['sdn-ip']) # FIXME: sdn-ip needs a rename + opts.add('--cluster-dns', dns['sdn-ip']) # FIXME sdn-ip needs a rename opts.add('--cluster-domain', dns['domain']) create_config(servers[0]) diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 07d8d593b70..a49d2c6de2c 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -40,6 +40,10 @@ cluster/gce/trusty/configure-helper.sh: sed -i -e "s@{{ *pillar\.get('storage cluster/gce/trusty/configure-helper.sh: sed -i -e "s@{{pillar\['allow_privileged'\]}}@true@g" "${src_file}" cluster/gce/util.sh: local node_ip=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \ cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: context['pillar'] = {'num_nodes': get_node_count()} +cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: db.set('kubernetes-master.service-cidr', service_cidr()) +cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: api_opts.add('--service-cluster-ip-range', service_cidr()) +cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: elif hookenv.config('service-cidr') != service_cidr(): +cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: msg = "Cannot change {0} to {1}".format(service_cidr(), cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: cluster_dns.set_dns_info(53, hookenv.config('dns_domain'), dns_ip) cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: ip = service_cidr().split('/')[0] cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py: ip = service_cidr().split('/')[0]