diff --git a/test/e2e/cluster_logging_gcl.go b/test/e2e/cluster_logging_gcl.go index ccd87a455c6..9d5e65687ee 100644 --- a/test/e2e/cluster_logging_gcl.go +++ b/test/e2e/cluster_logging_gcl.go @@ -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() { @@ -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() -}