From fe249eabbfa9688ba544e836cbff4931e0f8f536 Mon Sep 17 00:00:00 2001 From: Steven McDonald Date: Fri, 1 Mar 2019 13:43:38 +0100 Subject: [PATCH] Remove docker-prestart hook This breaks networking if Docker is restarted (https://github.com/kubernetes/kops/issues/6191). The Docker issue linked in the hook's comments has been closed for over 3 years, and this workaround has not been used by upstream Kubernetes for over a year: https://github.com/kubernetes/kubernetes/commit/5f9735de53c0a7f1334d91b59bcd87c6fbe2a06f#diff-af1d281c3ce49f7bfe110f7c64c96fdc It therefore seems unlikely that this hook is still necessary. --- nodeup/pkg/model/docker.go | 9 -------- .../dockerbuilder/docker_1.12.1/tasks.yaml | 1 - .../tests/dockerbuilder/logflags/tasks.yaml | 1 - .../tests/dockerbuilder/simple/tasks.yaml | 1 - .../opt/kubernetes/helpers/docker-prestart | 21 ------------------- .../kubernetes/helpers/docker-prestart.meta | 3 --- 6 files changed, 36 deletions(-) delete mode 100644 upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart delete mode 100644 upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart.meta diff --git a/nodeup/pkg/model/docker.go b/nodeup/pkg/model/docker.go index d5357e519c..28525676e4 100644 --- a/nodeup/pkg/model/docker.go +++ b/nodeup/pkg/model/docker.go @@ -925,7 +925,6 @@ func (b *DockerBuilder) buildSystemdSocket() *nodetasks.Service { func (b *DockerBuilder) buildSystemdService(dockerVersionMajor int64, dockerVersionMinor int64) *nodetasks.Service { oldDocker := dockerVersionMajor <= 1 && dockerVersionMinor <= 11 usesDockerSocket := true - hasDockerBabysitter := false var dockerdCommand string if oldDocker { @@ -934,10 +933,6 @@ func (b *DockerBuilder) buildSystemdService(dockerVersionMajor int64, dockerVers dockerdCommand = "/usr/bin/dockerd" } - if b.Distribution.IsDebianFamily() { - hasDockerBabysitter = true - } - manifest := &systemd.Manifest{} manifest.Set("Unit", "Description", "Docker Application Container Engine") manifest.Set("Unit", "Documentation", "https://docs.docker.com") @@ -1005,10 +1000,6 @@ func (b *DockerBuilder) buildSystemdService(dockerVersionMajor int64, dockerVers // set delegate yes so that systemd does not reset the cgroups of docker containers manifest.Set("Service", "Delegate", "yes") - if hasDockerBabysitter { - manifest.Set("Service", "ExecStartPre", "/opt/kubernetes/helpers/docker-prestart") - } - manifest.Set("Install", "WantedBy", "multi-user.target") manifestString := manifest.Render() diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/tasks.yaml index cd84b8b348..474c4fa8a9 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/tasks.yaml @@ -248,7 +248,6 @@ definition: | RestartSec=2s StartLimitInterval=0 Delegate=yes - ExecStartPre=/opt/kubernetes/helpers/docker-prestart [Install] WantedBy=multi-user.target diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml index 2ffcf1bef1..e2a45e2890 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml @@ -248,7 +248,6 @@ definition: | RestartSec=2s StartLimitInterval=0 Delegate=yes - ExecStartPre=/opt/kubernetes/helpers/docker-prestart [Install] WantedBy=multi-user.target diff --git a/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml index 2ffcf1bef1..e2a45e2890 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml @@ -248,7 +248,6 @@ definition: | RestartSec=2s StartLimitInterval=0 Delegate=yes - ExecStartPre=/opt/kubernetes/helpers/docker-prestart [Install] WantedBy=multi-user.target diff --git a/upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart b/upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart deleted file mode 100644 index 97a31ce2fb..0000000000 --- a/upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Copyright 2015 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script is intended to be run before we start Docker. - -# cleanup docker network checkpoint to avoid running into known issue -# of docker (https://github.com/docker/docker/issues/18283) -rm -rf /var/lib/docker/network diff --git a/upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart.meta b/upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart.meta deleted file mode 100644 index aac9c2ebd8..0000000000 --- a/upup/models/nodeup/docker/_systemd/_debian_family/files/opt/kubernetes/helpers/docker-prestart.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "mode": "0755" -} \ No newline at end of file