Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce coredns replicas from 2 to 1 #8552

Merged
merged 3 commits into from
Jun 25, 2020
Merged

Reduce coredns replicas from 2 to 1 #8552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d3a0c4
Reduce coredns replicas from 2 to 1
Jun 25, 2020
1b8eaaf
Move kubectl binary function to kapi package to prevent future cyclic…
Jun 25, 2020
1769750
fix log level
Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions pkg/addons/kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"os/exec"
"path"

"k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/vmpath"
Expand All @@ -32,7 +33,7 @@ func kubectlCommand(cc *config.ClusterConfig, files []string, enable bool) *exec
v = cc.KubernetesConfig.KubernetesVersion
}

kubectlBinary := kubectlBinaryPath(v)
kubectlBinary := kapi.KubectlBinaryPath(v)

kubectlAction := "apply"
if !enable {
Expand All @@ -46,7 +47,3 @@ func kubectlCommand(cc *config.ClusterConfig, files []string, enable bool) *exec

return exec.Command("sudo", args...)
}

func kubectlBinaryPath(version string) string {
return path.Join(vmpath.GuestPersistentDir, "binaries", version, "kubectl")
}
7 changes: 7 additions & 0 deletions pkg/kapi/kapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package kapi
import (
"context"
"fmt"
"path"
"time"

"github.com/golang/glog"
Expand All @@ -37,6 +38,7 @@ import (
watchtools "k8s.io/client-go/tools/watch"
kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/minikube/pkg/minikube/proxy"
"k8s.io/minikube/pkg/minikube/vmpath"
)

var (
Expand Down Expand Up @@ -205,3 +207,8 @@ func WaitForService(c kubernetes.Interface, namespace, name string, exist bool,
func IsRetryableAPIError(err error) bool {
return apierr.IsTimeout(err) || apierr.IsServerTimeout(err) || apierr.IsTooManyRequests(err) || apierr.IsInternalError(err)
}

// KubectlBinaryPath returns the path to kubectl on the node
func KubectlBinaryPath(version string) string {
return path.Join(vmpath.GuestPersistentDir, "binaries", version, "kubectl")
}
19 changes: 19 additions & 0 deletions pkg/minikube/node/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/drivers/kic/oci"
"k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/bootstrapper"
"k8s.io/minikube/pkg/minikube/bootstrapper/images"
"k8s.io/minikube/pkg/minikube/cluster"
Expand Down Expand Up @@ -146,6 +147,12 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList)
}

wg.Add(1)
go func() {
rescaleCoreDNS(starter.Cfg, starter.Runner)
wg.Done()
}()

if apiServer {
// special ops for none , like change minikube directory.
// multinode super doesn't work on the none driver
Expand Down Expand Up @@ -507,3 +514,15 @@ func prepareNone() {
exit.WithCodeT(exit.Permissions, "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}", out.V{"minikube_dir_path": localpath.MiniPath(), "error": err})
}
}

// rescaleCoreDNS attempts to reduce coredns replicas from 2 to 1 to improve CPU overhead
// no worries if this doesn't work
func rescaleCoreDNS(cc *config.ClusterConfig, runner command.Runner) {
kubectl := kapi.KubectlBinaryPath(cc.KubernetesConfig.KubernetesVersion)
cmd := exec.Command("sudo", "KUBECONFIG=/var/lib/minikube/kubeconfig", kubectl, "scale", "deployment", "--replicas=1", "coredns", "-n=kube-system")
if _, err := runner.RunCmd(cmd); err != nil {
glog.Warningf("unable to scale coredns replicas to 1: %v", err)
} else {
glog.Infof("successfully scaled coredns replicas to 1")
}
}