Nutanix defaults

aws · Jun 8, 2024 · 3375891 · 3375891
1 parent 8e1ae1e
commit 3375891
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/pkg/providers/nutanix/config/cp-template.yaml b/pkg/providers/nutanix/config/cp-template.yaml
@@ -337,10 +337,12 @@ spec:
           # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
           # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
           #cgroup-driver: cgroupfs
+{{- if not .kubeletConfiguration }}
           eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
 {{- if .kubeletExtraArgs }}
 {{ .kubeletExtraArgs.ToYaml | indent 10 }}
 {{- end }}
+{{- end }}
 {{- if .controlPlaneTaints }}
         taints:
 {{- range .controlPlaneTaints}}
@@ -361,11 +363,13 @@ spec:
         criSocket: /var/run/containerd/containerd.sock
         kubeletExtraArgs:
           cloud-provider: external
+{{- if not .kubeletConfiguration }}
           read-only-port: "0"
           anonymous-auth: "false"
 {{- if .kubeletExtraArgs }}
 {{ .kubeletExtraArgs.ToYaml | indent 10 }}
 {{- end }}
+{{- end }}
 {{- if .controlPlaneTaints }}
         taints:
 {{- range .controlPlaneTaints}}

diff --git a/pkg/providers/nutanix/config/md-template.yaml b/pkg/providers/nutanix/config/md-template.yaml
@@ -121,10 +121,12 @@ spec:
             # We have to pin the cgroupDriver to cgroupfs as kubeadm >=1.21 defaults to systemd
             # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
             #cgroup-driver: cgroupfs
+{{- if not .kubeletConfiguration }}
             eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
 {{- if .kubeletExtraArgs }}
 {{ .kubeletExtraArgs.ToYaml | indent 12 }}
 {{- end }}
+{{- end }}
 {{- if .workerNodeGroupTaints }}
           taints:
  {{- range .workerNodeGroupTaints}}

diff --git a/pkg/providers/nutanix/template.go b/pkg/providers/nutanix/template.go
@@ -168,9 +168,6 @@ func buildTemplateMapCP(
 		Append(clusterapi.APIServerExtraArgs(clusterSpec.Cluster.Spec.ControlPlaneConfiguration.APIServerExtraArgs)).
 		Append(clusterapi.EtcdEncryptionExtraArgs(clusterSpec.Cluster.Spec.EtcdEncryption))
 	clusterapi.SetPodIAMAuthExtraArgs(clusterSpec.Cluster.Spec.PodIAMConfig, apiServerExtraArgs)
-	kubeletExtraArgs := clusterapi.SecureTlsCipherSuitesExtraArgs().
-		Append(clusterapi.ResolvConfExtraArgs(clusterSpec.Cluster.Spec.ClusterNetwork.DNS.ResolvConf)).
-		Append(clusterapi.ControlPlaneNodeLabelsExtraArgs(clusterSpec.Cluster.Spec.ControlPlaneConfiguration))
 
 	auditPolicy, err := common.GetAuditPolicy(clusterSpec.Cluster.Spec.KubernetesVersion)
 	if err != nil {
@@ -200,7 +197,6 @@ func buildTemplateMapCP(
 		"corednsVersion":               versionsBundle.KubeDistro.CoreDNS.Tag,
 		"etcdRepository":               versionsBundle.KubeDistro.Etcd.Repository,
 		"etcdImageTag":                 versionsBundle.KubeDistro.Etcd.Tag,
-		"kubeletExtraArgs":             kubeletExtraArgs.ToPartialYaml(),
 		"kubeVipImage":                 versionsBundle.Nutanix.KubeVip.VersionedImage(),
 		"kubeVipSvcEnable":             false,
 		"kubeVipLBEnable":              false,
@@ -328,6 +324,11 @@ func buildTemplateMapCP(
 		}
 
 		values["kubeletConfiguration"] = string(kcString)
+	} else {
+		kubeletExtraArgs := clusterapi.SecureTlsCipherSuitesExtraArgs().
+			Append(clusterapi.ResolvConfExtraArgs(clusterSpec.Cluster.Spec.ClusterNetwork.DNS.ResolvConf)).
+			Append(clusterapi.ControlPlaneNodeLabelsExtraArgs(clusterSpec.Cluster.Spec.ControlPlaneConfiguration))
+		values["kubeletExtraArgs"] = kubeletExtraArgs.ToPartialYaml()
 	}
 
 	return values, nil
@@ -337,9 +338,6 @@ func buildTemplateMapMD(clusterSpec *cluster.Spec, workerNodeGroupMachineSpec v1
 	versionsBundle := clusterSpec.WorkerNodeGroupVersionsBundle(workerNodeGroupConfiguration)
 	format := "cloud-config"
 
-	kubeletExtraArgs := clusterapi.SecureTlsCipherSuitesExtraArgs().
-		Append(clusterapi.ResolvConfExtraArgs(clusterSpec.Cluster.Spec.ClusterNetwork.DNS.ResolvConf)).
-		Append(clusterapi.WorkerNodeLabelsExtraArgs(workerNodeGroupConfiguration))
 	values := map[string]interface{}{
 		"clusterName":            clusterSpec.Cluster.Name,
 		"eksaSystemNamespace":    constants.EksaSystemNamespace,
@@ -356,7 +354,6 @@ func buildTemplateMapMD(clusterSpec *cluster.Spec, workerNodeGroupMachineSpec v1
 		"imageIDType":            workerNodeGroupMachineSpec.Image.Type,
 		"imageName":              workerNodeGroupMachineSpec.Image.Name,
 		"imageUUID":              workerNodeGroupMachineSpec.Image.UUID,
-		"kubeletExtraArgs":       kubeletExtraArgs.ToPartialYaml(),
 		"nutanixPEClusterIDType": workerNodeGroupMachineSpec.Cluster.Type,
 		"nutanixPEClusterName":   workerNodeGroupMachineSpec.Cluster.Name,
 		"nutanixPEClusterUUID":   workerNodeGroupMachineSpec.Cluster.UUID,
@@ -414,6 +411,11 @@ func buildTemplateMapMD(clusterSpec *cluster.Spec, workerNodeGroupMachineSpec v1
 		}
 
 		values["kubeletConfiguration"] = string(kcString)
+	} else {
+		kubeletExtraArgs := clusterapi.SecureTlsCipherSuitesExtraArgs().
+			Append(clusterapi.ResolvConfExtraArgs(clusterSpec.Cluster.Spec.ClusterNetwork.DNS.ResolvConf)).
+			Append(clusterapi.WorkerNodeLabelsExtraArgs(workerNodeGroupConfiguration))
+		values["kubeletExtraArgs"] = kubeletExtraArgs.ToPartialYaml()
 	}
 	return values, nil
 }