Add installation configure of LH GuaranteedInstanceManagerCPU

Signed-off-by: Jian Wang <[email protected]>
harvester · Apr 18, 2024 · c0aaf56 · c0aaf56
1 parent 59add1f
commit c0aaf56
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -110,6 +110,9 @@ type LHDefaultSettings struct {
 	// 0 is valid, means not setting CPU resources, use pointer to check if it is set
 	GuaranteedEngineManagerCPU  *uint32 `json:"guaranteedEngineManagerCPU,omitempty"`
 	GuaranteedReplicaManagerCPU *uint32 `json:"guaranteedReplicaManagerCPU,omitempty"`
+	// from Longhorn v1.5.0, LH merges the above two into one
+	// the above two are not used afterwards, but Harvester keeps them for compatibility
+	GuaranteedInstanceManagerCPU *uint32 `json:"guaranteedInstanceManagerCPU,omitempty"`
 }
 
 type LonghornChartValues struct {

diff --git a/pkg/config/cos.go b/pkg/config/cos.go
@@ -30,11 +30,12 @@ const (
 	ifcfgGlobPattern       = networkConfigDirectory + "ifcfg-*"
 	ifrouteGlobPattern     = networkConfigDirectory + "ifroute-*"
 
-	bootstrapConfigCount               = 6
-	defaultReplicaCount                = 3
-	defaultGuaranteedEngineManagerCPU  = 12   // means percentage 12%
-	defaultGuaranteedReplicaManagerCPU = 12   // means percentage 12%
-	defaultSystemImageSize             = 3072 // size of /run/initramfs/cos-state/cOS/active.img in MB
+	bootstrapConfigCount                = 6
+	defaultReplicaCount                 = 3
+	defaultGuaranteedEngineManagerCPU   = 12   // means percentage 12%
+	defaultGuaranteedReplicaManagerCPU  = 12   // means percentage 12%
+	defaultGuaranteedInstanceManagerCPU = 12   // means percentage 12%
+	defaultSystemImageSize              = 3072 // size of /run/initramfs/cos-state/cOS/active.img in MB
 )
 
 var (
@@ -280,6 +281,10 @@ func setConfigDefaultValues(config *HarvesterConfig) {
 	if config.Harvester.Longhorn.DefaultSettings.GuaranteedReplicaManagerCPU != nil && *config.Harvester.Longhorn.DefaultSettings.GuaranteedReplicaManagerCPU > defaultGuaranteedReplicaManagerCPU {
 		*config.Harvester.Longhorn.DefaultSettings.GuaranteedReplicaManagerCPU = defaultGuaranteedReplicaManagerCPU
 	}
+
+	if config.Harvester.Longhorn.DefaultSettings.GuaranteedInstanceManagerCPU != nil && *config.Harvester.Longhorn.DefaultSettings.GuaranteedInstanceManagerCPU > defaultGuaranteedInstanceManagerCPU {
+		*config.Harvester.Longhorn.DefaultSettings.GuaranteedInstanceManagerCPU = defaultGuaranteedInstanceManagerCPU
+	}
 }
 
 func initRancherdStage(config *HarvesterConfig, stage *yipSchema.Stage) error {

diff --git a/pkg/config/templates/rancherd-10-harvester.yaml b/pkg/config/templates/rancherd-10-harvester.yaml
@@ -143,11 +143,8 @@ resources:
         defaultSettings:
           taintToleration: "kubevirt.io/drain:NoSchedule"
           defaultDataPath: "/var/lib/harvester/defaultdisk"
-          {{- if .Harvester.Longhorn.DefaultSettings.GuaranteedEngineManagerCPU }}
-          guaranteedEngineManagerCPU: {{ .Harvester.Longhorn.DefaultSettings.GuaranteedEngineManagerCPU }}
-          {{- end }}
-          {{- if .Harvester.Longhorn.DefaultSettings.GuaranteedReplicaManagerCPU }}
-          guaranteedReplicaManagerCPU: {{ .Harvester.Longhorn.DefaultSettings.GuaranteedReplicaManagerCPU }}
+          {{- if .Harvester.Longhorn.DefaultSettings.GuaranteedInstanceManagerCPU }}
+          guaranteedInstanceManagerCPU: {{ .Harvester.Longhorn.DefaultSettings.GuaranteedInstanceManagerCPU }}
           {{- end }}
       harvester-network-controller:
         enabled: true