Skip to content

K
k3s
Commit 0ac996e0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #42062 from timothysc/kubeadm-etcd

Automatic merge from submit-queue (batch tested with PRs 41962, 42055, 42062, 42019, 42054) Don't restrict etcd on self host installs b/c a clipped etcd can have **What this PR does / why we need it**: Remove cpu-clipping from self hosted etcd install from the masters. **Special notes for your reviewer**: **Release note**: ``` NONE ```
parents bc650d7e 3e3cfcc9
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
cmd/kubeadm/app/master/manifests.go
View file @ 0ac996e0
...@@ -111,7 +111,6 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error { ...@@ -111,7 +111,6 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
VolumeMounts: []api.VolumeMount{certsVolumeMount(), etcdVolumeMount(), k8sVolumeMount()}, VolumeMounts: []api.VolumeMount{certsVolumeMount(), etcdVolumeMount(), k8sVolumeMount()},
Image: images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage), Image: images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage),
LivenessProbe: componentProbe(2379, "/health"), LivenessProbe: componentProbe(2379, "/health"),
Resources: componentResources("200m"),
}, certsVolume(cfg), etcdVolume(cfg), k8sVolume(cfg)) }, certsVolume(cfg), etcdVolume(cfg), k8sVolume(cfg))
etcdPod.Spec.SecurityContext = &api.PodSecurityContext{ etcdPod.Spec.SecurityContext = &api.PodSecurityContext{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment