Deploy Command for OCP

Makefile

@@ -208,6 +208,16 @@ test-cmd-devfile-create:
 test-cmd-devfile-push:
 	ginkgo $(GINKGO_FLAGS) -focus="odo devfile push command tests" tests/integration/devfile/
 
+# Run odo deploy devfile command tests
+.PHONY: test-cmd-devfile-deploy
+test-cmd-devfile-deploy:     	
+	ginkgo $(GINKGO_FLAGS) -focus="odo devfile deploy command tests" tests/integration/devfile/
+
+# Run odo deploy delete devfile command tests
+.PHONY: test-cmd-devfile-deploy-delete
+test-cmd-devfile-deploy-delete:
+	ginkgo $(GINKGO_FLAGS) -focus="odo devfile deploy delete command tests" tests/integration/devfile/
+
 # Run odo devfile watch command tests
 .PHONY: test-cmd-devfile-watch
 test-cmd-devfile-watch:

pkg/devfile/adapters/common/interface.go

@@ -3,8 +3,11 @@ package common
 // ComponentAdapter defines the functions that platform-specific adapters must implement
 type ComponentAdapter interface {
 	Push(parameters PushParameters) error
+	Build(parameters BuildParameters) error
+	Deploy(parameters DeployParameters) error
 	DoesComponentExist(cmpName string) bool
 	Delete(labels map[string]string) error
+	DeployDelete(manifest []byte) error
 }
 
 // StorageAdapter defines the storage functions that platform-specific adapters must implement

pkg/devfile/adapters/common/types.go

@@ -26,6 +26,23 @@ type Storage struct {
 	Volume DevfileVolume
 }
 
+// BuildParameters is a struct containing the parameters to be used when building the image for a devfile component
+type BuildParameters struct {
+	Path            string                  // Path refers to the parent folder containing the source code to push up to a component
+	DockerfileBytes []byte                  // DockerfileBytes is the contents of the project Dockerfile in bytes
+	EnvSpecificInfo envinfo.EnvSpecificInfo // EnvSpecificInfo contains infomation of env.yaml file
+	Tag             string                  // Tag refers to the image tag of the image being built
+	IgnoredFiles    []string                // IgnoredFiles is the list of files to not push up to a component
+}
+
+// DeployParameters is a struct containing the parameters to be used when building the image for a devfile component
+type DeployParameters struct {
+	EnvSpecificInfo envinfo.EnvSpecificInfo // EnvSpecificInfo contains infomation of env.yaml file
+	Tag             string                  // Tag refers to the image tag of the image being built
+	ManifestSource  []byte                  // Source of the manifest file
+	DeploymentPort  int                     // Port to be used in deployment manifest
+}
+
 // PushParameters is a struct containing the parameters to be used when pushing to a devfile component
 type PushParameters struct {
 	Path              string                  // Path refers to the parent folder containing the source code to push up to a component

pkg/devfile/adapters/docker/adapter.go

@@ -33,6 +33,18 @@ func (d Adapter) Push(parameters common.PushParameters) error {
 	return nil
 }
 
+func (k Adapter) Build(parameters common.BuildParameters) error {
+	return errors.New("Deploy command not supported when building image using pushTarget=Docker")
+}
+
+func (k Adapter) Deploy(parameters common.DeployParameters) error {
+	return errors.New("Deploy command not supported when using pushTarget=Docker")
+}
+
+func (k Adapter) DeployDelete(manifest []byte) error {
+	return errors.New("Deploy delete command not supported when using pushTarget=Docker")
+}
+
 // DoesComponentExist returns true if a component with the specified name exists
 func (d Adapter) DoesComponentExist(cmpName string) bool {
 	return d.componentAdapter.DoesComponentExist(cmpName)

pkg/devfile/adapters/docker/component/adapter.go

@@ -52,6 +52,12 @@ type Adapter struct {
 	machineEventLogger        machineoutput.MachineEventLoggingClient
 }
 
+func (a Adapter) Build(parameters common.BuildParameters) (err error) { return nil }
+
+func (a Adapter) Deploy(parameters common.DeployParameters) (err error) { return nil }
+
+func (a Adapter) DeployDelete(manifest []byte) (err error) { return nil }
+
 // Push updates the component if a matching component exists or creates one if it doesn't exist
 func (a Adapter) Push(parameters common.PushParameters) (err error) {
 	componentExists, err := utils.ComponentExists(a.Client, a.Devfile.Data, a.ComponentName)

pkg/devfile/adapters/interface.go

@@ -0,0 +1,14 @@
+package adapters
+
+import (
+	"github.com/openshift/odo/pkg/devfile/adapters/common"
+)
+
+type PlatformAdapter interface {
+	Push(parameters common.PushParameters) error
+	Build(parameters common.BuildParameters) error
+	Deploy(parameters common.DeployParameters) error
+	DoesComponentExist(cmpName string) bool
+	Delete(labels map[string]string) error
+	DeployDelete(manifest []byte) error
+}

pkg/devfile/adapters/kubernetes/adapter.go

@@ -37,7 +37,39 @@ func (k Adapter) Push(parameters common.PushParameters) error {
 	return nil
 }
 
-// DoesComponentExist returns true if a component with the specified name exists
+// Build creates Kubernetes resources to build an image for the component
+func (k Adapter) Build(parameters common.BuildParameters) error {
+
+	err := k.componentAdapter.Build(parameters)
+	if err != nil {
+		return errors.Wrap(err, "Failed to build image for the component")
+	}
+
+	return nil
+}
+
+// Build creates Kubernetes resources to build an image for the component
+func (k Adapter) Deploy(parameters common.DeployParameters) error {
+
+	err := k.componentAdapter.Deploy(parameters)
+	if err != nil {
+		return errors.Wrap(err, "Failed to deploy the application")
+	}
+
+	return nil
+}
+
+// Build creates Kubernetes resources to build an image for the component
+func (k Adapter) DeployDelete(manifest []byte) error {
+
+	err := k.componentAdapter.DeployDelete(manifest)
+	if err != nil {
+		return errors.Wrap(err, "Failed to delete the deployed application")
+	}
+
+	return nil
+}
+
 func (k Adapter) DoesComponentExist(cmpName string) bool {
 	return k.componentAdapter.DoesComponentExist(cmpName)
 }