Merge pull request kubernetes#3815 from jayantjain93/additional_os_di…

…stribution

added additional os-distributions

cluster-autoscaler/cloudprovider/gce/reserved.go

@@ -172,11 +172,11 @@ func parsePercentageToRatio(percentString string) (float64, error) {
 // CalculateOSReservedEphemeralStorage estimates how much ephemeral storage OS will reserve and eviction threshold
 func CalculateOSReservedEphemeralStorage(diskSize int64, osDistribution OperatingSystemDistribution) int64 {
 	switch osDistribution {
-	case OperatingSystemDistributionCOS:
+	case OperatingSystemDistributionCOS, OperatingSystemDistributionCOSContainerd:
 		storage := int64(math.Ceil(0.015635*float64(diskSize))) + int64(math.Ceil(4.148*GiB)) // os partition estimation
 		storage += int64(math.Min(100*MiB, math.Ceil(0.001*float64(diskSize))))               // over-provisioning buffer
 		return storage
-	case OperatingSystemDistributionUbuntu:
+	case OperatingSystemDistributionUbuntu, OperatingSystemDistributionUbuntuContainerd:
 		storage := int64(math.Ceil(0.03083*float64(diskSize))) + int64(math.Ceil(0.171*GiB)) // os partition estimation
 		storage += int64(math.Min(100*MiB, math.Ceil(0.001*float64(diskSize))))              // over-provisioning buffer
 		return storage

cluster-autoscaler/cloudprovider/gce/templates.go

@@ -418,6 +418,10 @@ const (
 	OperatingSystemDistributionWindowsSAC OperatingSystemDistribution = "windows_sac"
 	// OperatingSystemDistributionCOS is used if operating distribution system is COS
 	OperatingSystemDistributionCOS OperatingSystemDistribution = "cos"
+	// OperatingSystemDistributionCOSContainerd is used if operating distribution system is COS Containerd
+	OperatingSystemDistributionCOSContainerd OperatingSystemDistribution = "cos_containerd"
+	// OperatingSystemDistributionUbuntuContainerd is used if operating distribution system is Ubuntu Containerd
+	OperatingSystemDistributionUbuntuContainerd OperatingSystemDistribution = "ubuntu_containerd"
 
 	// OperatingSystemDistributionDefault defines which operating system will be assumed if not explicitly passed via AUTOSCALER_ENV_VARS
 	OperatingSystemDistributionDefault = OperatingSystemDistributionCOS
@@ -445,6 +449,10 @@ func extractOperatingSystemDistributionFromKubeEnv(kubeEnv string) OperatingSyst
 		return OperatingSystemDistributionWindowsSAC
 	case string(OperatingSystemDistributionCOS):
 		return OperatingSystemDistributionCOS
+	case string(OperatingSystemDistributionCOSContainerd):
+		return OperatingSystemDistributionCOSContainerd
+	case string(OperatingSystemDistributionUbuntuContainerd):
+		return OperatingSystemDistributionUbuntuContainerd
 	default:
 		klog.Errorf("unexpected os-distribution=%v passed via AUTOSCALER_ENV_VARS", osDistributionValue)
 		return OperatingSystemDistributionUnknown

cluster-autoscaler/cloudprovider/gce/templates_test.go

@@ -842,6 +842,28 @@ func TestExtractOperatingSystemDistributionFromKubeEnv(t *testing.T) {
 				"KUBELET_TEST_ARGS: --experimental-allocatable-ignore-eviction\n",
 			expectedOperatingSystemDistribution: OperatingSystemDistributionCOS,
 		},
+		{
+			name: "cos containerd",
+			kubeEnv: "ENABLE_NODE_PROBLEM_DETECTOR: 'daemonset'\n" +
+				"DNS_SERVER_IP: '10.0.0.10'\n" +
+				"AUTOSCALER_ENV_VARS: node_labels=a=b,c=d,cloud.google.com/gke-nodepool=pool-3,cloud.google.com/gke-preemptible=true;" +
+				"node_taints='dedicated=ml:NoSchedule,test=dev:PreferNoSchedule,a=b:c';" +
+				"kube_reserved=cpu=1000m,memory=300000Mi;" +
+				"os_distribution=cos_containerd\n" +
+				"KUBELET_TEST_ARGS: --experimental-allocatable-ignore-eviction\n",
+			expectedOperatingSystemDistribution: OperatingSystemDistributionCOSContainerd,
+		},
+		{
+			name: "ubuntu containerd",
+			kubeEnv: "ENABLE_NODE_PROBLEM_DETECTOR: 'daemonset'\n" +
+				"DNS_SERVER_IP: '10.0.0.10'\n" +
+				"AUTOSCALER_ENV_VARS: node_labels=a=b,c=d,cloud.google.com/gke-nodepool=pool-3,cloud.google.com/gke-preemptible=true;" +
+				"node_taints='dedicated=ml:NoSchedule,test=dev:PreferNoSchedule,a=b:c';" +
+				"kube_reserved=cpu=1000m,memory=300000Mi;" +
+				"os_distribution=ubuntu_containerd\n" +
+				"KUBELET_TEST_ARGS: --experimental-allocatable-ignore-eviction\n",
+			expectedOperatingSystemDistribution: OperatingSystemDistributionUbuntuContainerd,
+		},
 		{
 			name: "ubuntu",
 			kubeEnv: "ENABLE_NODE_PROBLEM_DETECTOR: 'daemonset'\n" +