Set '--config=/etc/k0s/k0s.yaml' only on controller install (#106)

* Set '--config=/etc/k0s/k0s.yaml' only on controller install Signed-off-by: Jussi Nummelin <[email protected]> * pull system images from quay.io to mitigate possible docker hub rate limits Signed-off-by: Jussi Nummelin <[email protected]> * use 0.11.0 for smokes Signed-off-by: Jussi Nummelin <[email protected]>
k0sproject · Mar 11, 2021 · 57db321 · 57db321
1 parent 9535e37
commit 57db321
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/config/cluster/host.go b/config/cluster/host.go
@@ -173,7 +173,9 @@ func (h *Host) K0sInstallCommand() string {
 		flags.AddUnlessExist(fmt.Sprintf(`--token-file "%s"`, h.K0sJoinTokenPath()))
 	}
 
-	flags.AddUnlessExist(fmt.Sprintf(`--config "%s"`, h.K0sConfigPath()))
+	if h.IsController() {
+		flags.AddUnlessExist(fmt.Sprintf(`--config "%s"`, h.K0sConfigPath()))
+	}
 
 	return h.Configurer.K0sCmdf("install %s %s", role, flags.Join())
 }

diff --git a/config/cluster/host_test.go b/config/cluster/host_test.go
@@ -62,7 +62,7 @@ func TestK0sInstallCommand(t *testing.T) {
 	h := Host{Role: "worker"}
 	h.Configurer = &mockconfigurer{}
 
-	require.Equal(t, `k0s install worker --token-file "from-configurer" --config "from-configurer"`, h.K0sInstallCommand())
+	require.Equal(t, `k0s install worker --token-file "from-configurer"`, h.K0sInstallCommand())
 
 	h.Role = "controller"
 	h.Metadata.IsK0sLeader = true

diff --git a/smoke-test/k0sctl.yaml b/smoke-test/k0sctl.yaml
@@ -15,4 +15,31 @@ spec:
         port: 9023
         keyPath: ./id_rsa_k0s
   k0s:
-    version: "0.11.0-rc1"
+    version: "0.11.0"
+    config:
+      images:
+        konnectivity:
+          image: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent
+          version: v0.0.13
+        metricsserver:
+          image: gcr.io/k8s-staging-metrics-server/metrics-server
+          version: v0.3.7
+        kubeproxy:
+          image: k8s.gcr.io/kube-proxy
+          version: v1.20.4
+        coredns:
+          image: quay.io/jnummelin/coredns
+          version: 1.7.0
+        calico:
+          cni:
+            image: quay.io/jnummelin/calico-cni
+            version: v3.16.2
+          flexvolume:
+            image: quay.io/jnummelin/calico-pod2daemon-flexvol
+            version: v3.16.2
+          node:
+            image: quay.io/jnummelin/calico-node
+            version: v3.16.2
+          kubecontrollers:
+            image: quay.io/jnummelin/calico-kube-controllers
+            version: v3.16.2