Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade machine-controller v1.11.2 #861

Merged
merged 2 commits into from
Apr 10, 2020
Merged

Upgrade machine-controller v1.11.2 #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f39540
Upgrade machine-controller v1.11.2
kron4eg Apr 9, 2020
f733e39
Move centos docker version to constant
kron4eg Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions pkg/scripts/os.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ import (
"github.com/kubermatic/kubeone/pkg/apis/kubeone"
)

const (
centosDockerVersion = "18.09.9-3.el7"
)

const (
kubeadmDebianTemplate = `
sudo swapoff -a
Expand Down Expand Up @@ -49,7 +53,11 @@ sudo mkdir -p /etc/docker
cat <<EOF | sudo tee /etc/docker/daemon.json
{
"exec-opts": ["native.cgroupdriver=systemd"],
"storage-driver": "overlay2"
"storage-driver": "overlay2",
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
}
}
EOF

Expand Down Expand Up @@ -109,6 +117,18 @@ sudo sed -i 's/SELINUX=enforcing/SELINUX=permissive/g' /etc/sysconfig/selinux

. /etc/kubeone/proxy-env

sudo mkdir -p /etc/docker
cat <<EOF | sudo tee /etc/docker/daemon.json
{
"exec-opts": ["native.cgroupdriver=systemd"],
"storage-driver": "overlay2",
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
}
}
EOF

# Short-Circuit the installation if it was already executed
if type docker &>/dev/null && type kubelet &>/dev/null; then exit 0; fi

Expand Down Expand Up @@ -139,11 +159,16 @@ exclude=kube*
EOF
{{ end }}

sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo

sudo yum install -y --disableexcludes=kubernetes \
docker kubelet-{{ .KUBERNETES_VERSION }}-0 \
docker-ce-{{ .DOCKER_VERSION }} \
kubelet-{{ .KUBERNETES_VERSION }}-0 \
kubeadm-{{ .KUBERNETES_VERSION }}-0 \
kubectl-{{ .KUBERNETES_VERSION }}-0 \
kubernetes-cni-{{ .CNI_VERSION }}-0

sudo systemctl enable --now docker
sudo systemctl enable --now kubelet
`
Expand All @@ -158,7 +183,11 @@ sudo mkdir -p /etc/docker
cat <<EOF | sudo tee /etc/docker/daemon.json
{
"exec-opts": ["native.cgroupdriver=systemd"],
"storage-driver": "overlay2"
"storage-driver": "overlay2",
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
}
}
EOF
sudo systemctl restart docker
Expand Down Expand Up @@ -331,6 +360,7 @@ func KubeadmDebian(cluster *kubeone.KubeOneCluster, dockerVersion string) (strin

func KubeadmCentOS(cluster *kubeone.KubeOneCluster, proxy string) (string, error) {
return Render(kubeadmCentOSTemplate, Data{
"DOCKER_VERSION": centosDockerVersion,
"KUBERNETES_VERSION": cluster.Versions.Kubernetes,
"CNI_VERSION": cluster.Versions.KubernetesCNIVersion(),
"CONFIGURE_REPOSITORIES": cluster.SystemPackages.ConfigureRepositories,
Expand Down
2 changes: 1 addition & 1 deletion pkg/templates/machinecontroller/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const (
MachineControllerNamespace = metav1.NamespaceSystem
MachineControllerAppLabelKey = "app"
MachineControllerAppLabelValue = "machine-controller"
MachineControllerTag = "v1.11.1"
MachineControllerTag = "v1.11.2"
)

// Deploy deploys MachineController deployment with RBAC on the cluster
Expand Down