Add Image Comp, add Deploy Cmd Kind & handle conversion to v1alpha1

Signed-off-by: Maysun J Faisal <[email protected]>

Author: maysunfaisal

crds/workspace.devfile.io_devworkspaces.v1beta1.yaml

@@ -105,12 +105,15 @@ func convertDevWorkspaceTemplateSpecFrom_v1alpha2(src *v1alpha2.DevWorkspaceTemp
 		}
 	}
 	for _, srcComponent := range src.Components {
-		destComponent := Component{}
-		err := convertComponentFrom_v1alpha2(&srcComponent, &destComponent)
-		if err != nil {
-			return err
+		// Image Component is not present in v1alpha1
+		if srcComponent.Image == nil {
+			destComponent := Component{}
+			err := convertComponentFrom_v1alpha2(&srcComponent, &destComponent)
+			if err != nil {
+				return err
+			}
+			dest.Components = append(dest.Components, destComponent)
 		}
-		dest.Components = append(dest.Components, destComponent)
 	}
 	for _, srcProject := range src.Projects {
 		destProject := Project{}

crds/workspace.devfile.io_devworkspaces.yaml

@@ -18,14 +18,15 @@ const (
 )
 
 // CommandGroupKind describes the kind of command group.
-// +kubebuilder:validation:Enum=build;run;test;debug
+// +kubebuilder:validation:Enum=build;run;test;debug;deploy
 type CommandGroupKind string
 
 const (
-	BuildCommandGroupKind CommandGroupKind = "build"
-	RunCommandGroupKind   CommandGroupKind = "run"
-	TestCommandGroupKind  CommandGroupKind = "test"
-	DebugCommandGroupKind CommandGroupKind = "debug"
+	BuildCommandGroupKind  CommandGroupKind = "build"
+	RunCommandGroupKind    CommandGroupKind = "run"
+	TestCommandGroupKind   CommandGroupKind = "test"
+	DebugCommandGroupKind  CommandGroupKind = "debug"
+	DeployCommandGroupKind CommandGroupKind = "deploy"
 )
 
 type CommandGroup struct {

crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml

@@ -0,0 +1,38 @@
+package v1alpha2
+
+// ImageType describes the type of image.
+// Only one of the following image type may be specified.
+// +kubebuilder:validation:Enum=Dockerfile
+type ImageType string
+
+const (
+	DockerfileImageType ImageType = "Dockerfile"
+)
+
+type BaseImage struct {
+}
+
+// Component that allows the developer to build a runtime image for outerloop
+type ImageComponent struct {
+	BaseComponent `json:",inline"`
+	Image         `json:",inline"`
+}
+
+type Image struct {
+	// Name of the image for the resulting outerloop build
+	ImageName  string `json:"imageName"`
+	ImageUnion `json:",inline"`
+}
+
+// +union
+type ImageUnion struct {
+	// Type of image
+	//
+	// +unionDiscriminator
+	// +optional
+	ImageType ImageType `json:"imageType,omitempty"`
+
+	// Allows specifying dockerfile type build
+	// +optional
+	Dockerfile *DockerfileImage `json:"dockerfile,omitempty"`
+}

crds/workspace.devfile.io_devworkspacetemplates.yaml

@@ -0,0 +1,68 @@
+package v1alpha2
+
+// DockerfileLocationType describes the type of
+// the location for the Dockerfile outerloop build.
+// Only one of the following location type may be specified.
+// +kubebuilder:validation:Enum=Uri;Id;Git
+type DockerfileLocationType string
+
+const (
+	UriLikeDockerfileLocationType DockerfileLocationType = "Uri"
+	IdLikeDockerfileLocationType  DockerfileLocationType = "Id"
+	GitLikeDockerfileLocationType DockerfileLocationType = "Git"
+)
+
+// Dockerfile Image type to specify the outerloop build using a Dockerfile
+type DockerfileImage struct {
+	BaseImage          `json:",inline"`
+	DockerfileLocation `json:",inline"`
+	Dockerfile         `json:",inline"`
+
+	// Registry URL to pull the Dockerfile from when using id as Dockerfile src.
+	// To ensure the dockerfile gets resolved consistently in different environments,
+	// it is recommended to always specify the `regsitryURL` when `Id` is used.
+	// +optional
+	RegistryUrl string `json:"registryUrl,omitempty"`
+
+	// Location of the Dockerfile in the Git repository when using git as Dockerfile src.
+	// +optional
+	GitLocation string `json:"gitLocation,omitempty"`
+}
+
+// +union
+type DockerfileLocation struct {
+	// Type of Dockerfile location
+	// +
+	// +unionDiscriminator
+	// +optional
+	LocationType DockerfileLocationType `json:"locationType,omitempty"`
+
+	// URI Reference of a Dockerfile.
+	// It can be a full URL or a relative URI from the current devfile as the base URI.
+	// +optional
+	Uri string `json:"uri,omitempty"`
+
+	// Id in a registry that contains a Dockerfile
+	// +optional
+	Id string `json:"id,omitempty"`
+
+	// Project's Git source
+	// +optional
+	Git *GitProjectSource `json:"git,omitempty"`
+}
+
+type Dockerfile struct {
+	// Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container
+	// +optional
+	BuildContext string `json:"buildContext,omitempty"`
+
+	// The arguments to supply to the dockerfile build.
+	// +optional
+	Args []string `json:"args,omitempty" patchStrategy:"replace"`
+
+	// Specify if a privileged builder pod is required.
+	//
+	// Default value is `false`
+	// +optional
+	RootRequired bool `json:"rootRequired,omitempty"`
+}

pkg/apis/workspaces/v1alpha1/conversion.go

@@ -7,7 +7,7 @@ import (
 
 // ComponentType describes the type of component.
 // Only one of the following component type may be specified.
-// +kubebuilder:validation:Enum=Container;Kubernetes;Openshift;Volume;Plugin;Custom
+// +kubebuilder:validation:Enum=Container;Kubernetes;Openshift;Volume;Image;Plugin;Custom
 type ComponentType string
 
 const (
@@ -16,6 +16,7 @@ const (
 	OpenshiftComponentType  ComponentType = "Openshift"
 	PluginComponentType     ComponentType = "Plugin"
 	VolumeComponentType     ComponentType = "Volume"
+	ImageComponentType      ComponentType = "Image"
 	CustomComponentType     ComponentType = "Custom"
 )
 
@@ -72,6 +73,10 @@ type ComponentUnion struct {
 	// +optional
 	Volume *VolumeComponent `json:"volume,omitempty"`
 
+	// Allows specifying the definition of an image for outer loop builds
+	// +optional
+	Image *ImageComponent `json:"image,omitempty"`
+
 	// Allows importing a plugin.
 	//
 	// Plugins are mainly imported devfiles that contribute components, commands