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

Add addon-manager, dashboard, and storage-provisioner to minikube logs #3982

Merged
merged 2 commits into from
Mar 26, 2019
Merged

Add addon-manager, dashboard, and storage-provisioner to minikube logs #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec135dc
Add addon-manager, dashboard, and storage-provisioner to minikube logs
tstromberg Mar 26, 2019
48e4808
Remove special unrelated docker check
tstromberg Mar 26, 2019
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
3 changes: 0 additions & 3 deletions pkg/minikube/cruntime/cruntime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,6 @@ func TestContainerFunctions(t *testing.T) {
"fgh1": prefix + "coredns",
"xyz2": prefix + "storage",
}
if tc.runtime == "docker" {
runner.containers["zzz"] = "unrelated"
}
cr, err := New(Config{Type: tc.runtime, Runner: runner})
if err != nil {
t.Fatalf("New(%s): %v", tc.runtime, err)
Expand Down
4 changes: 0 additions & 4 deletions pkg/minikube/cruntime/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ import (
"github.com/golang/glog"
)

// KubernetesContainerPrefix is the prefix of each kubernetes container
const KubernetesContainerPrefix = "k8s_"

// Docker contains Docker runtime state
type Docker struct {
Socket string
Expand Down Expand Up @@ -99,7 +96,6 @@ func (r *Docker) KubeletOptions() map[string]string {

// ListContainers returns a list of containers
func (r *Docker) ListContainers(filter string) ([]string, error) {
filter = KubernetesContainerPrefix + filter
content, err := r.Runner.CombinedOutput(fmt.Sprintf(`docker ps -a --filter="name=%s" --format="{{.ID}}"`, filter))
if err != nil {
return nil, err
Expand Down
3 changes: 3 additions & 0 deletions pkg/minikube/logs/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ var importantPods = []string{
"coredns",
"kube-scheduler",
"kube-proxy",
"kube-addon-manager",
"kubernetes-dashboard",
"storage-provisioner",
}

// lookbackwardsCount is how far back to look in a log for problems. This should be large enough to
Expand Down