Bind to the appropriate kubernetes-cni version (#309) (#310)

* Add the KubernetesCNIVersion method

Signed-off-by: Marko Mudrinić <[email protected]>

* Install correct kubernetes-cni version

Signed-off-by: Marko Mudrinić <[email protected]>

* Upgrade to correct kubernetes-cni version

Signed-off-by: Marko Mudrinić <[email protected]>

Author: xmudrii

pkg/config/cluster.go

@@ -235,6 +235,22 @@ func (m *VersionConfig) Validate() error {
 	return nil
 }
 
+// KubernetesCNIVersion returns kubernetes-cni package version
+func (m *VersionConfig) KubernetesCNIVersion() string {
+	s := semver.MustParse(m.Kubernetes)
+	c, _ := semver.NewConstraint(">= 1.13.0, <= 1.13.4")
+
+	switch {
+	// Validation ensures that the oldest cluster version is 1.13.0.
+	// Versions 1.13.0-1.13.4 uses 0.6.0, so it's safe to return 0.6.0
+	// if >= 1.13.0, <= 1.13.4 constraint check successes.
+	case c.Check(s):
+		return "0.6.0"
+	default:
+		return "0.7.5"
+	}
+}
+
 // NetworkConfig describes the node network.
 type NetworkConfig struct {
 	PodSubnetVal     string `json:"pod_subnet"`

pkg/installer/installation/prerequisites.go

@@ -17,6 +17,8 @@ limitations under the License.
 package installation
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 
 	"github.com/kubermatic/kubeone/pkg/config"
@@ -146,6 +148,7 @@ func installKubeadmDebian(ctx *util.Context) error {
 	_, _, err := ctx.Runner.Run(kubeadmDebianCommand, util.TemplateVariables{
 		"KUBERNETES_VERSION": ctx.Cluster.Versions.Kubernetes,
 		"DOCKER_VERSION":     dockerVersion,
+		"CNI_VERSION":        ctx.Cluster.Versions.KubernetesCNIVersion(),
 	})
 
 	return errors.WithStack(err)
@@ -190,14 +193,16 @@ sudo apt-get update
 
 docker_ver=$(apt-cache madison docker-ce | grep "{{ .DOCKER_VERSION }}" | head -1 | awk '{print $3}')
 kube_ver=$(apt-cache madison kubelet | grep "{{ .KUBERNETES_VERSION }}" | head -1 | awk '{print $3}')
+cni_ver=$(apt-cache madison kubernetes-cni | grep "{{ .CNI_VERSION }}" | head -1 | awk '{print $3}')
 
-sudo apt-mark unhold docker-ce kubelet kubeadm kubectl
+sudo apt-mark unhold docker-ce kubelet kubeadm kubectl kubernetes-cni
 sudo apt-get install -y --no-install-recommends \
      docker-ce=${docker_ver} \
      kubeadm=${kube_ver} \
      kubectl=${kube_ver} \
-     kubelet=${kube_ver}
-sudo apt-mark hold docker-ce kubelet kubeadm kubectl
+     kubelet=${kube_ver} \
+     kubernetes-cni=${cni_ver}
+sudo apt-mark hold docker-ce kubelet kubeadm kubectl kubernetes-cni
 `
 
 const kubeadmCentOSCommand = `
@@ -231,21 +236,23 @@ EOF
 sudo yum install -y --disableexcludes=kubernetes \
 			docker kubelet-{{ .KUBERNETES_VERSION }}-0\
 			kubeadm-{{ .KUBERNETES_VERSION }}-0 \
-			kubectl-{{ .KUBERNETES_VERSION }}-0
+			kubectl-{{ .KUBERNETES_VERSION }}-0 \
+			kubernetes-cni-{{ .CNI_VERSION }}-0
 sudo systemctl enable --now docker
 `
 
 func installKubeadmCentOS(ctx *util.Context) error {
 	_, _, err := ctx.Runner.Run(kubeadmCentOSCommand, util.TemplateVariables{
 		"KUBERNETES_VERSION": ctx.Cluster.Versions.Kubernetes,
+		"CNI_VERSION":        ctx.Cluster.Versions.KubernetesCNIVersion(),
 	})
 	return err
 }
 
 func installKubeadmCoreOS(ctx *util.Context) error {
 	_, _, err := ctx.Runner.Run(kubeadmCoreOSCommand, util.TemplateVariables{
 		"KUBERNETES_VERSION": ctx.Cluster.Versions.Kubernetes,
-		"CNI_VERSION":        "v0.7.1",
+		"CNI_VERSION":        fmt.Sprintf("v%s", ctx.Cluster.Versions.KubernetesCNIVersion()),
 	})
 
 	return err