Merge pull request #584 from diakovnec/cleanup_way

adding beforeStartCleanUp logic to cleanup console pods

Author: openshift-merge-bot[bot]

cmd/ocm-backplane/console/console.go

@@ -249,7 +249,11 @@ func (o *consoleOptions) run(cmd *cobra.Command, argv []string) error {
 	if err != nil {
 		return err
 	}
-
+	//Perform a cleanup before starting a new console
+	err = o.beforeStartCleanUp(ce)
+	if err != nil {
+		return err
+	}
 	done := make(chan bool)
 	errs := make(chan error)
 
@@ -644,6 +648,35 @@ func (o *consoleOptions) printURL() error {
 	return nil
 }
 
+func (o *consoleOptions) beforeStartCleanUp(ce containerEngineInterface) error {
+	clusterID, err := getClusterID()
+	if err != nil {
+		return fmt.Errorf("error getting cluster ID: %v", err)
+	}
+	containersToCleanUp := []string{
+		fmt.Sprintf("monitoring-plugin-%s", clusterID),
+		fmt.Sprintf("console-%s", clusterID),
+	}
+
+	logger.Infoln("Starting initial cleanup of containers")
+
+	for _, c := range containersToCleanUp {
+		exist, err := ce.containerIsExist(c)
+		if err != nil {
+			return fmt.Errorf("failed to check if container %s exists: %v", c, err)
+		}
+		if exist {
+			err := ce.stopContainer(c)
+			if err != nil {
+				return fmt.Errorf("failed to stop container %s during the cleanup process: %v", c, err)
+			}
+		} else {
+			logger.Infof("Container %s does not exist, no need to clean up", c)
+		}
+	}
+	return nil
+}
+
 func (o *consoleOptions) cleanUp(ce containerEngineInterface) error {
 	clusterID, err := getClusterID()
 	if err != nil {

cmd/ocm-backplane/console/console_test.go

@@ -113,6 +113,36 @@ var _ = Describe("console command", func() {
 		err = utils.CreateTempKubeConfig(&testKubeCfg)
 		Expect(err).To(BeNil())
 	}
+	Context("Should perform existing pods cleanup before starting the console", func() {
+		It("Should not return an error if no pods are found", func() {
+			setupConfig()
+			createPathPodman()
+			o := consoleOptions{}
+			ce, err := o.getContainerEngineImpl()
+			Expect(err).To(BeNil())
+			err = o.beforeStartCleanUp(ce)
+			Expect(err).To(BeNil())
+		})
+
+		It("Should perform verification if console and monitoring plugin containers are present", func() {
+			setupConfig()
+			createPathPodman()
+			mockOcmInterface.EXPECT().GetClusterInfoByID(clusterID).Return(nil, nil).AnyTimes()
+			o := consoleOptions{}
+			ce, err := o.getContainerEngineImpl()
+			Expect(err).To(BeNil())
+			capturedCommands = nil
+
+			err = o.beforeStartCleanUp(ce)
+			Expect(err).To(BeNil())
+
+			Expect(len(capturedCommands)).To(Equal(2))
+			Expect(capturedCommands[0][0]).To(Equal("podman"))
+			Expect(capturedCommands[0][1]).To(Equal("ps"))
+			Expect(capturedCommands[1][0]).To(Equal("podman"))
+			Expect(capturedCommands[1][1]).To(Equal("ps"))
+		})
+	})
 
 	Context("when console command executes", func() {
 		It("should read the openbrowser variable from environment variables and it is true", func() {