github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add support for kube-proxy cluster-cidr option

pull/6/head
Rye Terrell 2017-03-28 16:20:39 -05:00 committed by George Kraft
parent ebd2f88f6b
commit 33fee22032
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -288,16 +288,22 @@ def start_worker(kube_api, kube_control, cni):
# the correct DNS even though the server isn't ready yet. # the correct DNS even though the server isn't ready yet.
dns = kube_control.get_dns() dns = kube_control.get_dns()
cluster_cidr = cni.get_config()['cidr']
if cluster_cidr is None:
hookenv.log('Waiting for cluster cidr.')
return
if (is_state('kubernetes-worker.restart-needed') or if (is_state('kubernetes-worker.restart-needed') or
data_changed('kube-api-servers', servers) or data_changed('kube-api-servers', servers) or
data_changed('kube-dns', dns)): data_changed('kube-dns', dns) or
data_changed('cluster-cidr', cluster_cidr)):
# set --allow-privileged flag for kubelet # set --allow-privileged flag for kubelet
set_privileged() set_privileged()
create_config(servers[0]) create_config(servers[0])
configure_worker_services(servers, dns) configure_worker_services(servers, dns, cluster_cidr)
set_state('kubernetes-worker.config.created') set_state('kubernetes-worker.config.created')
restart_unit_services() restart_unit_services()
update_kubelet_status() update_kubelet_status()
@ -424,7 +430,7 @@ def create_config(server):
user='kubelet') user='kubelet')
def configure_worker_services(api_servers, dns): def configure_worker_services(api_servers, dns, cluster_cidr):
''' Add remaining flags for the worker services and configure snaps to use ''' Add remaining flags for the worker services and configure snaps to use
them ''' them '''
layer_options = layer.options('tls-client') layer_options = layer.options('tls-client')
@ -448,6 +454,7 @@ def configure_worker_services(api_servers, dns):
kubelet_opts.add('tls-private-key-file', server_key_path) kubelet_opts.add('tls-private-key-file', server_key_path)
kube_proxy_opts = FlagManager('kube-proxy') kube_proxy_opts = FlagManager('kube-proxy')
kube_proxy_opts.add('cluster-cidr', cluster_cidr)
kube_proxy_opts.add('kubeconfig', kubeconfig_path) kube_proxy_opts.add('kubeconfig', kubeconfig_path)
kube_proxy_opts.add('logtostderr', 'true') kube_proxy_opts.add('logtostderr', 'true')
kube_proxy_opts.add('v', '0') kube_proxy_opts.add('v', '0')

2
hack/verify-flags/exceptions.txt
View File

@ -47,7 +47,7 @@ cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py:def send_clu
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py:def service_cidr(): cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py:def service_cidr():
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py: context.update({'kube_api_endpoint': ','.join(api_servers), cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py: context.update({'kube_api_endpoint': ','.join(api_servers),
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py: ca_cert_path = layer_options.get('ca_certificate_path') cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py: ca_cert_path = layer_options.get('ca_certificate_path')
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py:def configure_worker_services(api_servers, dns): cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py:def configure_worker_services(api_servers, dns, cluster_cidr):
cluster/lib/logging.sh: local source_file=${BASH_SOURCE[$frame_no]} cluster/lib/logging.sh: local source_file=${BASH_SOURCE[$frame_no]}
cluster/lib/logging.sh: local source_file=${BASH_SOURCE[$stack_skip]} cluster/lib/logging.sh: local source_file=${BASH_SOURCE[$stack_skip]}
cluster/log-dump.sh: local -r node_name="${1}" cluster/log-dump.sh: local -r node_name="${1}"