github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48450 from wwwtyro/rye/lxc-disable-conntrack-max

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 48399, 48450, 48144)

configure kube-proxy to run with unset conntrack param when in lxc

**What this PR does / why we need it**: Configures the Juju Charm code to run kube-proxy with `conntrack-max-per-core` set to `0` when in an lxc as a workaround for issues when mounting `/sys/module/nf_conntrack/parameters/hashsize`

**Release note**:

```release-note
Configures the Juju Charm code to run kube-proxy with conntrack-max-per-core set to 0 when in an lxc as a workaround for issues when mounting /sys/module/nf_conntrack/parameters/hashsize
```
This commit is contained in:
Kubernetes Submit Queue
2017-07-05 08:58:37 -07:00
committed by GitHub
parent e773c88b0a 05fbc7a7f8
commit 7b13208d61
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/juju/layers/kubernetes-worker/layer.yaml
View File

@@ -22,6 +22,7 @@ options:
- 'ceph-common' - 'ceph-common'
- 'nfs-common' - 'nfs-common'
- 'socat' - 'socat'
- 'virt-what'
tls-client: tls-client:
ca_certificate_path: '/root/cdk/ca.crt' ca_certificate_path: '/root/cdk/ca.crt'
server_certificate_path: '/root/cdk/server.crt' server_certificate_path: '/root/cdk/server.crt'

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

@@ -482,6 +482,9 @@ def configure_worker_services(api_servers, dns, cluster_cidr):
kube_proxy_opts.add('v', '0') kube_proxy_opts.add('v', '0')
kube_proxy_opts.add('master', random.choice(api_servers), strict=True) kube_proxy_opts.add('master', random.choice(api_servers), strict=True)
if b'lxc' in check_output('virt-what', shell=True):
kube_proxy_opts.add('conntrack-max-per-core', '0')
cmd = ['snap', 'set', 'kubelet'] + kubelet_opts.to_s().split(' ') cmd = ['snap', 'set', 'kubelet'] + kubelet_opts.to_s().split(' ')
check_call(cmd) check_call(cmd)
cmd = ['snap', 'set', 'kube-proxy'] + kube_proxy_opts.to_s().split(' ') cmd = ['snap', 'set', 'kube-proxy'] + kube_proxy_opts.to_s().split(' ')