Enable dynamic config (#215)

replicatedhq · Dec 11, 2023 · 62447b9 · 62447b9
1 parent 39096e5
commit 62447b9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/cmd/embedded-cluster/join.go b/cmd/embedded-cluster/join.go
@@ -223,7 +223,7 @@ func runK0sInstallCommand(fullcmd string) error {
 	args := strings.Split(fullcmd, " ")
 	args = append(args, "--token-file", "/etc/k0s/join-token")
 	if strings.Contains(fullcmd, "controller") {
-		args = append(args, "--disable-components", "konnectivity-server")
+		args = append(args, "--disable-components", "konnectivity-server", "--enable-dynamic-config")
 	}
 	cmd := exec.Command(args[0], args[1:]...)
 	stdout := bytes.NewBuffer(nil)

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -232,8 +232,9 @@ func generateConfigForHosts(ctx context.Context, hosts ...*cluster.Host) (*v1bet
 		Spec: &cluster.Spec{
 			Hosts: hosts,
 			K0s: &cluster.K0s{
-				Version: k0sversion.MustParse(defaults.K0sVersion),
-				Config:  k0sconfig,
+				DynamicConfig: true,
+				Version:       k0sversion.MustParse(defaults.K0sVersion),
+				Config:        k0sconfig,
 			},
 		},
 	}, nil

diff --git a/pkg/config/host.go b/pkg/config/host.go
@@ -27,7 +27,7 @@ type hostcfg struct {
 func (h *hostcfg) render() *cluster.Host {
 	var ifls []string
 	if h.Role != "worker" {
-		ifls = []string{"--disable-components konnectivity-server"}
+		ifls = []string{"--disable-components konnectivity-server --enable-dynamic-config"}
 	}
 	ifls = append(ifls, labelsToArg(h.Labels)...)
 	return &cluster.Host{

diff --git a/pkg/config/testdata/override-change-name.yaml b/pkg/config/testdata/override-change-name.yaml
@@ -16,7 +16,7 @@ config: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig
@@ -53,7 +53,7 @@ expected: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig

diff --git a/pkg/config/testdata/override-enable-telemetry.yaml b/pkg/config/testdata/override-enable-telemetry.yaml
@@ -16,7 +16,7 @@ config: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig
@@ -54,7 +54,7 @@ expected: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig

diff --git a/pkg/config/testdata/override-setting-ip-forward.yaml b/pkg/config/testdata/override-setting-ip-forward.yaml
@@ -16,7 +16,7 @@ config: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig
@@ -57,7 +57,7 @@ expected: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig

diff --git a/pkg/config/testdata/override-zero-out-sans-list.yaml b/pkg/config/testdata/override-zero-out-sans-list.yaml
@@ -16,7 +16,7 @@ config: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig
@@ -58,7 +58,7 @@ expected: |-
       noTaints: true
     k0s:
       version: v1.27.5+k0s.0
-      dynamicConfig: false
+      dynamicConfig: true
       config:
         apiVersion: k0s.k0sproject.io/v1beta1
         kind: ClusterConfig