Merge pull request kubernetes#102704 from jackfrancis/automated-cherr…

…y-pick-of-#102673-upstream-release-1.20 Automated cherry pick of kubernetes#102673: feat: remove ephemeral-storage etcd requirement
openshift · Jun 11, 2021 · 66612c8 · 66612c8
2 parents 88ad9ae + 3d5750d
commit 66612c8
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/cmd/kubeadm/app/phases/etcd/local.go b/cmd/kubeadm/app/phases/etcd/local.go
@@ -232,9 +232,8 @@ func GetEtcdPodSpec(cfg *kubeadmapi.ClusterConfiguration, endpoint *kubeadmapi.A
 			},
 			Resources: v1.ResourceRequirements{
 				Requests: v1.ResourceList{
-					v1.ResourceCPU:              resource.MustParse("100m"),
-					v1.ResourceMemory:           resource.MustParse("100Mi"),
-					v1.ResourceEphemeralStorage: resource.MustParse("100Mi"),
+					v1.ResourceCPU:    resource.MustParse("100m"),
+					v1.ResourceMemory: resource.MustParse("100Mi"),
 				},
 			},
 			LivenessProbe: staticpodutil.LivenessProbe(probeHostname, "/health", probePort, probeScheme),