Also configure docker's containerd version via CLI flag

kubermatic · Dec 20, 2022 · 7c335e2 · 7c335e2
1 parent 7cb2878
commit 7c335e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pkg/containerruntime/containerruntime.go b/pkg/containerruntime/containerruntime.go
@@ -17,7 +17,7 @@ limitations under the License.
 package containerruntime
 
 import (
-	"github.com/Masterminds/semver/v3"
+	"github.com/coreos/go-semver/semver"
 
 	"github.com/kubermatic/machine-controller/pkg/providerconfig/types"
 )
@@ -130,6 +130,7 @@ func (cfg Config) Engine(kubeletVersion *semver.Version) Engine {
 		containerLogMaxFiles: cfg.ContainerLogMaxFiles,
 		containerLogMaxSize:  cfg.ContainerLogMaxSize,
 		registryCredentials:  cfg.RegistryCredentials,
+		containerdVersion:    cfg.ContainerdVersion,
 	}
 
 	containerd := &Containerd{

diff --git a/pkg/containerruntime/docker.go b/pkg/containerruntime/docker.go
@@ -27,8 +27,8 @@ import (
 )
 
 const (
-	LegacyDockerContainerdVersion  = "1.4"
-	DefaultDockerContainerdVersion = "1.6"
+	LegacyDockerContainerdVersion  = "1.4*"
+	DefaultDockerContainerdVersion = "1.6*"
 	DefaultDockerVersion           = "20.10"
 	LegacyDockerVersion            = "19.03"
 )
@@ -39,6 +39,7 @@ type Docker struct {
 	containerLogMaxFiles string
 	containerLogMaxSize  string
 	registryCredentials  map[string]AuthConfig
+	containerdVersion    string
 }
 
 type DockerCfgJSON struct {
@@ -88,6 +89,10 @@ func (eng *Docker) ScriptFor(os types.OperatingSystem) (string, error) {
 		ContainerdVersion: DefaultDockerContainerdVersion,
 	}
 
+	if eng.containerdVersion != "" {
+		args.ContainerdVersion = eng.containerdVersion
+	}
+
 	switch os {
 	case types.OperatingSystemAmazonLinux2:
 		args.ContainerdVersion = LegacyDockerContainerdVersion
@@ -126,7 +131,7 @@ EOF
 
 yum install -y \
 {{- if .ContainerdVersion }}
-    containerd-{{ .ContainerdVersion }}* \
+    containerd-{{ .ContainerdVersion }} \
 {{- end }}
     docker-{{ .DockerVersion }}* \
     yum-plugin-versionlock
@@ -152,7 +157,7 @@ EOF
 yum install -y \
 {{- if .ContainerdVersion }}
     docker-ce-cli-{{ .DockerVersion }}* \
-    containerd.io-{{ .ContainerdVersion }}* \
+    containerd.io-{{ .ContainerdVersion }} \
 {{- end }}
     docker-ce-{{ .DockerVersion }}* \
     yum-plugin-versionlock
@@ -178,7 +183,7 @@ EOF
 
 apt-get install --allow-downgrades -y \
 {{- if .ContainerdVersion }}
-    containerd.io={{ .ContainerdVersion }}* \
+    containerd.io={{ .ContainerdVersion }} \
     docker-ce-cli=5:{{ .DockerVersion }}* \
 {{- end }}
     docker-ce=5:{{ .DockerVersion }}*