github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38302 from Crassirostris/revert-logging-e2e-verbosity

Browse Source 
Automatic merge from submit-queue

Revert "Make logging for gcl e2e test more verbose"

Revert test change in favor of https://github.com/kubernetes/kubernetes/pull/38213

CC @piosz
This commit is contained in:
Kubernetes Submit Queue 2016-12-09 06:49:21 -08:00 committed by GitHub
commit 72b52d4334
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/e2e/cluster_logging_gcl.go
View File

@ -31,20 +31,12 @@ import (
. "github.com/onsi/gomega" . "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() { var _ = framework.KubeDescribe("Cluster level logging using GCL", func() {
f := framework.NewDefaultFramework("gcl-logging") f := framework.NewDefaultFramework("gcl-logging")
BeforeEach(func() { BeforeEach(func() {
// TODO (crassirostris): Expand to GKE once the test is stable // TODO (crassirostris): Expand to GKE once the test is stable
framework.SkipUnlessProviderIs("gce") 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() { It("should check that logs from containers are ingested in GCL", func() {
@ -142,36 +134,3 @@ func readFilteredEntriesFromGcl(filter string) ([]string, error) {
return result, nil 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()
}