init-container: Remove pidfile handling

Previously, we needed to remove pidfiles in the k8s init container, however since commit 71a8634 ("daemon: Clean up k8s health EP pidfile on startup"), this logic has been shifted into the daemon. Since this logic is no longer needed, we can remove it from the init container. Signed-off-by: Joe Stringer <joe@covalent.io>
cilium · Nov 2, 2018 · 0df76e8 · 0df76e8
1 parent bb87ab3
commit 0df76e8
Show file tree

Hide file tree

Showing 23 changed files with 22 additions and 25 deletions.
diff --git a/contrib/packaging/docker/init-container.sh b/contrib/packaging/docker/init-container.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-echo "Removing old cilium and cilium-health pidfiles..."
-rm /var/run/cilium/cilium.pid \
-   /var/run/cilium/state/health-endpoint.pid
 if [ "${CLEAN_CILIUM_STATE}" = "true" ]; then
     echo "Removing Cilium state..."
     rm -rf /var/run/cilium/state;

diff --git a/examples/kubernetes/1.10/cilium-crio-ds.yaml b/examples/kubernetes/1.10/cilium-crio-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.10/cilium-crio.yaml b/examples/kubernetes/1.10/cilium-crio.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.10/cilium-ds.yaml b/examples/kubernetes/1.10/cilium-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.10/cilium.yaml b/examples/kubernetes/1.10/cilium.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.11/cilium-crio-ds.yaml b/examples/kubernetes/1.11/cilium-crio-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.11/cilium-crio.yaml b/examples/kubernetes/1.11/cilium-crio.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.11/cilium-ds.yaml b/examples/kubernetes/1.11/cilium-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.11/cilium.yaml b/examples/kubernetes/1.11/cilium.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.12/cilium-crio-ds.yaml b/examples/kubernetes/1.12/cilium-crio-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.12/cilium-crio.yaml b/examples/kubernetes/1.12/cilium-crio.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.12/cilium-ds.yaml b/examples/kubernetes/1.12/cilium-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.12/cilium.yaml b/examples/kubernetes/1.12/cilium.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.8/cilium-crio-ds.yaml b/examples/kubernetes/1.8/cilium-crio-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.8/cilium-crio.yaml b/examples/kubernetes/1.8/cilium-crio.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.8/cilium-ds.yaml b/examples/kubernetes/1.8/cilium-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.8/cilium.yaml b/examples/kubernetes/1.8/cilium.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.9/cilium-crio-ds.yaml b/examples/kubernetes/1.9/cilium-crio-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.9/cilium-crio.yaml b/examples/kubernetes/1.9/cilium-crio.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.9/cilium-ds.yaml b/examples/kubernetes/1.9/cilium-ds.yaml
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/1.9/cilium.yaml b/examples/kubernetes/1.9/cilium.yaml
@@ -115,7 +115,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/templates/v1/cilium-crio-ds.yaml.sed b/examples/kubernetes/templates/v1/cilium-crio-ds.yaml.sed
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext:

diff --git a/examples/kubernetes/templates/v1/cilium-ds.yaml.sed b/examples/kubernetes/templates/v1/cilium-ds.yaml.sed
@@ -33,7 +33,7 @@ spec:
       serviceAccountName: cilium
       initContainers:
         - name: clean-cilium-state
-          image: docker.io/cilium/cilium-init:2018-10-10
+          image: docker.io/cilium/cilium-init:2018-10-16
           imagePullPolicy: IfNotPresent
           command: ["/init-container.sh"]
           securityContext: