Merge pull request #10609 from mfojtik/revert-logging

Merged by openshift-bot
openshift · Aug 26, 2016 · de02920 · de02920
2 parents 6ac43a7 + b5fac0b
commit de02920
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 48 deletions.
diff --git a/pkg/cmd/cli/cmd/logs.go b/pkg/cmd/cli/cmd/logs.go
@@ -132,7 +132,6 @@ func (o *OpenShiftLogsOptions) Complete(f *clientcmd.Factory, out io.Writer, cmd
 		o.Options = bopts
 	case deployapi.Resource("deploymentconfig"):
 		dopts := &deployapi.DeploymentLogOptions{
-			Container:    podLogOptions.Container,
 			Follow:       podLogOptions.Follow,
 			Previous:     podLogOptions.Previous,
 			SinceSeconds: podLogOptions.SinceSeconds,

diff --git a/pkg/deploy/api/helpers.go b/pkg/deploy/api/helpers.go
@@ -24,7 +24,6 @@ func DeploymentToPodLogOptions(opts *DeploymentLogOptions) *kapi.PodLogOptions {
 		Timestamps:   opts.Timestamps,
 		TailLines:    opts.TailLines,
 		LimitBytes:   opts.LimitBytes,
-		Container:    opts.Container,
 	}
 }
 

diff --git a/test/extended/deployments/deployments.go b/test/extended/deployments/deployments.go
@@ -36,7 +36,6 @@ var _ = g.Describe("deploymentconfigs", func() {
 		historyLimitedDeploymentFixture = exutil.FixturePath("testdata", "deployment-history-limit.yaml")
 		minReadySecondsFixture          = exutil.FixturePath("testdata", "deployment-min-ready-seconds.yaml")
 		multipleICTFixture              = exutil.FixturePath("testdata", "deployment-example.yaml")
-		multiContainerFixture           = exutil.FixturePath("testdata", "test-deployment-config-multicontainer.yaml")
 		tagImagesFixture                = exutil.FixturePath("testdata", "tag-images-deployment.yaml")
 	)
 
@@ -483,24 +482,6 @@ var _ = g.Describe("deploymentconfigs", func() {
 		})
 	})
 
-	g.Describe("with logging with multiple containers [Conformance]", func() {
-		g.AfterEach(func() {
-			failureTrap(oc, "test-deployment-config-multicontainer", g.CurrentGinkgoTestDescription().Failed)
-		})
-
-		g.It("should be able to get the logs from each container", func() {
-			_, name, err := createFixture(oc, multiContainerFixture)
-			o.Expect(err).NotTo(o.HaveOccurred())
-			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())
-
-			_, err = oc.Run("logs").Args("dc/"+name, "-c", "container1").Output()
-			o.Expect(err).NotTo(o.HaveOccurred())
-			_, err = oc.Run("logs").Args("dc/"+name, "-c", "container2").Output()
-			o.Expect(err).NotTo(o.HaveOccurred())
-		})
-
-	})
-
 	g.Describe("with failing hook", func() {
 		g.AfterEach(func() {
 			failureTrap(oc, "hook", g.CurrentGinkgoTestDescription().Failed)

diff --git a/test/extended/testdata/test-deployment-config-multicontainer.yaml b/test/extended/testdata/test-deployment-config-multicontainer.yaml