Allow buildless direct deploy #31

pkg/apis/camel/v1alpha1/register.go

@@ -46,6 +46,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Integration{},
 		&IntegrationList{},
+		&IntegrationContext{},
+		&IntegrationContextList{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil

pkg/apis/camel/v1alpha1/types.go

@@ -18,6 +18,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"fmt"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -93,25 +95,60 @@ type PropertySpec struct {
 	Name  string
 	Value string
 }
+
+func (spec PropertySpec) String() string {
+	return fmt.Sprint("%s=%s", spec.Name, spec.Value)
+}
+
 type EnvironmentSpec struct {
 	Name  string
 	Value string
 }
 
+func (spec EnvironmentSpec) String() string {
+	return fmt.Sprint("%s=%s", spec.Name, spec.Value)
+}
+
 type IntegrationContextStatus struct {
 	Phase  IntegrationContextPhase `json:"phase,omitempty"`
-	Digest string                  `json:"digest,omitempty"`
 	Image  string                  `json:"image,omitempty"`
-	From   int                     `json:"from,omitempty"`
+	Digest string                  `json:"digest,omitempty"`
 }
 
 type IntegrationContextPhase string
 
 const (
-	// IntegrationContextPhaseDraft --
-	IntegrationContextPhaseDraft IntegrationContextPhase = "Draft"
+	// IntegrationContextKind --
+	IntegrationContextKind string = "IntegrationContext"
+
 	// IntegrationContextPhaseBuilding --
 	IntegrationContextPhaseBuilding IntegrationContextPhase = "Building"
+	// IntegrationContextPhaseDeploying --
+	IntegrationContextPhaseDeploying IntegrationContextPhase = "Deploying"
 	// IntegrationContextPhaseReady --
 	IntegrationContextPhaseReady IntegrationContextPhase = "Ready"
+	// IntegrationContextPhaseError --
+	IntegrationContextPhaseError IntegrationContextPhase = "Error"
 )
+
+func NewIntegrationContext(namespace string, name string) IntegrationContext {
+	return IntegrationContext{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: SchemeGroupVersion.String(),
+			Kind:       IntegrationContextKind,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+		},
+	}
+}
+
+func NewIntegrationContextList() IntegrationContextList {
+	return IntegrationContextList{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: SchemeGroupVersion.String(),
+			Kind:       IntegrationContextKind,
+		},
+	}
+}

pkg/build/api/types.go

@@ -25,8 +25,8 @@ type BuildSource struct {
 }
 
 type BuildIdentifier struct {
-	Name   string
-	Digest string
+	Name      string
+	Qualifier string
 }
 
 type Code struct {

pkg/build/build_manager.go

@@ -19,50 +19,40 @@ package build
 
 import (
 	"context"
+	"sync"
+
 	"github.com/apache/camel-k/pkg/build/api"
 	"github.com/apache/camel-k/pkg/build/local"
-	"sync"
 )
 
 // main facade to the image build system
-type BuildManager struct {
-	builds  map[api.BuildIdentifier]*api.BuildResult
-	mutex   sync.Mutex
+type Manager struct {
+	builds  sync.Map
 	builder api.Builder
 }
 
-func NewBuildManager(ctx context.Context, namespace string) *BuildManager {
-	return &BuildManager{
-		builds:  make(map[api.BuildIdentifier]*api.BuildResult),
+func NewManager(ctx context.Context, namespace string) *Manager {
+	return &Manager{
 		builder: local.NewLocalBuilder(ctx, namespace),
 	}
 }
 
-func (m *BuildManager) Get(identifier api.BuildIdentifier) api.BuildResult {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-
-	if info, present := m.builds[identifier]; !present || info == nil {
+func (m *Manager) Get(identifier api.BuildIdentifier) api.BuildResult {
+	if info, present := m.builds.Load(identifier); !present || info == nil {
 		return noBuildInfo()
 	} else {
-		return *info
+		return *info.(*api.BuildResult)
 	}
 }
 
-func (m *BuildManager) Start(source api.BuildSource) {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-
+func (m *Manager) Start(source api.BuildSource) {
 	initialBuildInfo := initialBuildInfo(&source)
-	m.builds[source.Identifier] = &initialBuildInfo
+	m.builds.Store(source.Identifier, &initialBuildInfo)
 
 	resChannel := m.builder.Build(source)
 	go func() {
 		res := <-resChannel
-		m.mutex.Lock()
-		defer m.mutex.Unlock()
-
-		m.builds[res.Source.Identifier] = &res
+		m.builds.Store(res.Source.Identifier, &res)
 	}()
 }
 

pkg/build/build_manager_integration_test.go

@@ -32,7 +32,7 @@ import (
 
 func TestBuild(t *testing.T) {
 	ctx := context.TODO()
-	buildManager := NewBuildManager(ctx, test.GetTargetNamespace())
+	buildManager := NewManager(ctx, test.GetTargetNamespace())
 	identifier := build.BuildIdentifier{
 		Name:   "man-test",
 		Digest: digest.Random(),
@@ -62,7 +62,7 @@ func TestBuild(t *testing.T) {
 func TestFailedBuild(t *testing.T) {
 
 	ctx := context.TODO()
-	buildManager := NewBuildManager(ctx, test.GetTargetNamespace())
+	buildManager := NewManager(ctx, test.GetTargetNamespace())
 	identifier := build.BuildIdentifier{
 		Name:   "man-test-2",
 		Digest: digest.Random(),

pkg/build/local/local_builder.go

@@ -154,7 +154,7 @@ func (b *localBuilder) publish(tarFile string, source build.BuildSource) (string
 				Output: buildv1.BuildOutput{
 					To: &v1.ObjectReference{
 						Kind: "ImageStreamTag",
-						Name: "camel-k-" + source.Identifier.Name + ":" + source.Identifier.Digest,
+						Name: "camel-k-" + source.Identifier.Name + ":" + source.Identifier.Qualifier,
 					},
 				},
 			},
@@ -248,7 +248,7 @@ func (b *localBuilder) publish(tarFile string, source build.BuildSource) (string
 	if is.Status.DockerImageRepository == "" {
 		return "", errors.New("dockerImageRepository not available in ImageStream")
 	}
-	return is.Status.DockerImageRepository + ":" + source.Identifier.Digest, nil
+	return is.Status.DockerImageRepository + ":" + source.Identifier.Qualifier, nil
 }
 
 func generateProjectDefinition(source build.BuildSource) (maven.ProjectDefinition, error) {

pkg/build/local/local_builder_integration_test.go

@@ -36,8 +36,8 @@ func TestBuild(t *testing.T) {
 
 	execution := builder.Build(build.BuildSource{
 		Identifier: build.BuildIdentifier{
-			Name:   "test0",
-			Digest: digest.Random(),
+			Name:      "test0",
+			Qualifier: digest.Random(),
 		},
 		Code: build.Code{
 			Content: code(),
@@ -56,8 +56,8 @@ func TestDoubleBuild(t *testing.T) {
 
 	execution1 := builder.Build(build.BuildSource{
 		Identifier: build.BuildIdentifier{
-			Name:   "test1",
-			Digest: digest.Random(),
+			Name:      "test1",
+			Qualifier: digest.Random(),
 		},
 		Code: build.Code{
 			Content: code(),
@@ -66,8 +66,8 @@ func TestDoubleBuild(t *testing.T) {
 
 	execution2 := builder.Build(build.BuildSource{
 		Identifier: build.BuildIdentifier{
-			Name:   "test2",
-			Digest: digest.Random(),
+			Name:      "test2",
+			Qualifier: digest.Random(),
 		},
 		Code: build.Code{
 			Content: code(),
@@ -88,8 +88,8 @@ func TestFailedBuild(t *testing.T) {
 
 	execution := builder.Build(build.BuildSource{
 		Identifier: build.BuildIdentifier{
-			Name:   "test3",
-			Digest: digest.Random(),
+			Name:      "test3",
+			Qualifier: digest.Random(),
 		},
 		Code: build.Code{
 			Content: code() + "-",

pkg/build/local/local_builder_test.go

@@ -27,8 +27,8 @@ import (
 func TestProjectGeneration(t *testing.T) {
 	source := api.BuildSource{
 		Identifier: api.BuildIdentifier{
-			Name:   "my-integration",
-			Digest: "",
+			Name:      "my-integration",
+			Qualifier: "",
 		},
 		Code: api.Code{
 			Name:     "my-code.js",
@@ -59,8 +59,8 @@ func TestProjectGeneration(t *testing.T) {
 func TestProjectGenerationWithFailure(t *testing.T) {
 	source := api.BuildSource{
 		Identifier: api.BuildIdentifier{
-			Name:   "my-integration",
-			Digest: "",
+			Name:      "my-integration",
+			Qualifier: "",
 		},
 		Code: api.Code{
 			Name:     "my-code.js",

pkg/client/cmd/context.go

@@ -29,7 +29,8 @@ func NewCmdContext(rootCmdOptions *RootCmdOptions) *cobra.Command {
 		Long:  `Configure an Integration Context.`,
 	}
 
-	cmd.AddCommand(newContextEditCmd(rootCmdOptions))
+	cmd.AddCommand(newContextCreateCmd(rootCmdOptions))
+	cmd.AddCommand(newContextDeleteCmd(rootCmdOptions))
 	cmd.AddCommand(newContextGetCmd(rootCmdOptions))
 
 	return &cmd