From 5c0d5c112d317db837d7bf30aff143e10371da8c Mon Sep 17 00:00:00 2001 From: Salvatore Mazzarino Date: Mon, 9 Sep 2019 22:48:05 +0200 Subject: [PATCH 1/4] Add tag during isDebian check family Signed-off-by: Salvatore Mazzarino --- nodeup/pkg/distros/distribution.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodeup/pkg/distros/distribution.go b/nodeup/pkg/distros/distribution.go index d0d9678e73..c87a9da34f 100644 --- a/nodeup/pkg/distros/distribution.go +++ b/nodeup/pkg/distros/distribution.go @@ -90,7 +90,7 @@ func (d Distribution) IsDebianFamily() bool { return true case DistributionCentos7, DistributionRhel7: return false - case DistributionCoreOS, DistributionContainerOS: + case DistributionCoreOS, DistributionFlatcar, DistributionContainerOS: return false default: klog.Fatalf("unknown distribution: %s", d) From f6908656bfafeb1a08823d762ffb1d41186545c4 Mon Sep 17 00:00:00 2001 From: Salvatore Mazzarino Date: Tue, 10 Sep 2019 19:32:27 +0200 Subject: [PATCH 2/4] Fix volume plugins dir Signed-off-by: Salvatore Mazzarino --- nodeup/pkg/model/kube_controller_manager.go | 4 ++++ nodeup/pkg/model/kubelet.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/nodeup/pkg/model/kube_controller_manager.go b/nodeup/pkg/model/kube_controller_manager.go index c8ee491001..a57489b229 100644 --- a/nodeup/pkg/model/kube_controller_manager.go +++ b/nodeup/pkg/model/kube_controller_manager.go @@ -166,6 +166,10 @@ func (b *KubeControllerManagerBuilder) buildPod() (*v1.Pod, error) { // The /usr directory is read-only for CoreOS volumePluginDir = "/var/lib/kubelet/volumeplugins/" + case distros.DistributionFlatcar: + // The /usr directory is read-only for CoreOS + volumePluginDir = "/var/lib/kubelet/volumeplugins/" + default: volumePluginDir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" } diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index f1437687ee..278262b5c5 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -580,6 +580,10 @@ func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, erro // The /usr directory is read-only for CoreOS c.VolumePluginDirectory = "/var/lib/kubelet/volumeplugins/" + case distros.DistributionFlatcar: + // The /usr directory is read-only for Flatcar + c.VolumePluginDirectory = "/var/lib/kubelet/volumeplugins/" + default: c.VolumePluginDirectory = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" } From 9732d06d97dcaf065d02ebc0744fc15a6951532d Mon Sep 17 00:00:00 2001 From: Salvatore Mazzarino Date: Tue, 10 Sep 2019 19:32:33 +0200 Subject: [PATCH 3/4] Add reference Signed-off-by: Salvatore Mazzarino --- nodeup/pkg/model/miscutils.go | 3 +++ nodeup/pkg/model/ntp.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nodeup/pkg/model/miscutils.go b/nodeup/pkg/model/miscutils.go index be24e18ae8..0a8ff9fb52 100644 --- a/nodeup/pkg/model/miscutils.go +++ b/nodeup/pkg/model/miscutils.go @@ -40,6 +40,9 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error { case distros.DistributionCoreOS: klog.V(2).Infof("Detected CoreOS; won't install misc. utils") return nil + case distros.DistributionFlatcar: + klog.V(2).Infof("Detected Flatcar; won't install misc. utils") + return nil } // TODO: These packages have been auto-installed for a long time, and likely we don't need all of them any longer diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go index be03d074af..5ecc103c2b 100644 --- a/nodeup/pkg/model/ntp.go +++ b/nodeup/pkg/model/ntp.go @@ -41,6 +41,9 @@ func (b *NTPBuilder) Build(c *fi.ModelBuilderContext) error { case distros.DistributionCoreOS: klog.Infof("Detected CoreOS; won't install ntp") return nil + case distros.DistributionFlatcar: + klog.Infof("Detected CoreOS; won't install ntp") + return nil } if b.Distribution.IsDebianFamily() { From 16f667d5a886709c6ab2c24872637a68fe843c7f Mon Sep 17 00:00:00 2001 From: Salvatore Mazzarino Date: Sun, 24 Nov 2019 18:58:49 +0100 Subject: [PATCH 4/4] Correct Distro name Signed-off-by: Salvatore Mazzarino --- nodeup/pkg/model/kube_controller_manager.go | 2 +- nodeup/pkg/model/ntp.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nodeup/pkg/model/kube_controller_manager.go b/nodeup/pkg/model/kube_controller_manager.go index a57489b229..e59d9bd3f5 100644 --- a/nodeup/pkg/model/kube_controller_manager.go +++ b/nodeup/pkg/model/kube_controller_manager.go @@ -167,7 +167,7 @@ func (b *KubeControllerManagerBuilder) buildPod() (*v1.Pod, error) { volumePluginDir = "/var/lib/kubelet/volumeplugins/" case distros.DistributionFlatcar: - // The /usr directory is read-only for CoreOS + // The /usr directory is read-only for Flatcar volumePluginDir = "/var/lib/kubelet/volumeplugins/" default: diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go index 5ecc103c2b..9231d2f523 100644 --- a/nodeup/pkg/model/ntp.go +++ b/nodeup/pkg/model/ntp.go @@ -42,7 +42,7 @@ func (b *NTPBuilder) Build(c *fi.ModelBuilderContext) error { klog.Infof("Detected CoreOS; won't install ntp") return nil case distros.DistributionFlatcar: - klog.Infof("Detected CoreOS; won't install ntp") + klog.Infof("Detected Flatcar; won't install ntp") return nil }