Merge pull request #53093 from MrHohn/kube-proxy-mount-lock

Automatic merge from submit-queue (batch tested with PRs 50280, 52529, 53093, 53108, 53168). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove touch-lock init container from kube-proxy **What this PR does / why we need it**: Ack https://github.com/kubernetes/kubeadm/issues/298, touch-lock init container is no longer needed after we have https://github.com/kubernetes/kubernetes/pull/46597. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #NONE **Special notes for your reviewer**: /assign @bowei @cmluciano cc @dixudx **Release note**: ```release-note NONE ```

Merge pull request #53093 from MrHohn/kube-proxy-mount-lock
c98dfbfa · Kubernetes Submit Queue · GitHub · 05200a4c · 1c85a633 · c98dfbfa
Commit c98dfbfa authored Sep 28, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 26 deletions

kube-proxy-ds.yaml cluster/addons/kube-proxy/kube-proxy-ds.yaml +1 -13

kube-proxy.manifest cluster/saltbase/salt/kube-proxy/kube-proxy.manifest +0 -13

No files found.
--- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml
+++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -28,16 +28,6 @@ spec:
      hostNetwork: true
      nodeSelector:
        beta.kubernetes.io/kube-proxy-ds-ready: "true"
-      initContainers:
-      - name: touch-lock
-        image: busybox
-        command: ['/bin/touch', '/run/xtables.lock']
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /run
-          name: run
-          readOnly: false
      containers:
      - name: kube-proxy
        image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
@@ -73,7 +63,5 @@ spec:
      - name: xtables-lock
        hostPath:
          path: /run/xtables.lock
-      - name: run
-        hostPath:
-          path: /run
+          type: FileOrCreate
      serviceAccountName: kube-proxy
--- a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
+++ b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
@@ -65,16 +65,6 @@ metadata:
 spec:
  {{pod_priority}}
  hostNetwork: true
-  initContainers:
-  - name: touch-lock
-    image: busybox
-    command: ['/bin/touch', '/run/xtables.lock']
-    securityContext:
-      privileged: true
-    volumeMounts:
-    - mountPath: /run
-      name: run
-      readOnly: false
  containers:
  - name: kube-proxy
    image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
@@ -121,9 +111,6 @@ spec:
      path: /var/log
    name: varlog
  - hostPath:
-      path: /run
-    name: run
-  - hostPath:
      path: /run/xtables.lock
      type: FileOrCreate
    name: iptableslock