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

Revert "Make logging for gcl e2e test more verbose" #38302

Merged
merged 1 commit into from
Dec 9, 2016
Merged

Revert "Make logging for gcl e2e test more verbose" #38302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 0 additions & 41 deletions test/e2e/cluster_logging_gcl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,12 @@ import (
. "github.com/onsi/gomega"
)

const (
increaseFluentdVerbosityCommand = "sudo sed -i 's/-q/-vv/g' /etc/kubernetes/manifests/fluentd-gcp.yaml;" +
" sudo sed -i 's/-q/-vv/g' /etc/kubernetes/manifests/fluentd-gcp-gci.yaml"
)

var _ = framework.KubeDescribe("Cluster level logging using GCL", func() {
f := framework.NewDefaultFramework("gcl-logging")

BeforeEach(func() {
// TODO (crassirostris): Expand to GKE once the test is stable
framework.SkipUnlessProviderIs("gce")

// TODO (crassirostris): Remove once the test is stable
increaseFluentdVerbosity(f)
})

It("should check that logs from containers are ingested in GCL", func() {
Expand Down Expand Up @@ -142,36 +134,3 @@ func readFilteredEntriesFromGcl(filter string) ([]string, error) {

return result, nil
}

func increaseFluentdVerbosity(f *framework.Framework) error {
masters, nodeList := framework.GetMasterAndWorkerNodesOrDie(f.ClientSet)

for master := range masters {
if err := increaseFluentdVerbosityOnNode(f, master); err != nil {
return err
}
}

for _, node := range nodeList.Items {
if err := increaseFluentdVerbosityOnNode(f, node.Name); err != nil {
return err
}
}

return nil
}

func increaseFluentdVerbosityOnNode(f *framework.Framework, nodeName string) error {
argList := []string{"compute",
"ssh",
nodeName,
"--project",
framework.TestContext.CloudConfig.ProjectID,
"--zone",
framework.TestContext.CloudConfig.Zone,
"--command",
increaseFluentdVerbosityCommand,
}

return exec.Command("gcloud", argList...).Run()
}