[camel-k] 01/11: refactor(trait): property names and error condition

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 7ce7b01a1fb12afc8a9e7d39d66f9a2a85193f08
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu May 20 16:19:00 2021 +0200

    refactor(trait): property names and error condition
---
 pkg/trait/builder.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index f2d0775..8828d3a 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -25,7 +25,10 @@ import (
 	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
 	"github.com/apache/camel-k/pkg/builder"
 	corev1 "k8s.io/api/core/v1"
+<<<<<<< HEAD
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+=======
+>>>>>>> refactor(trait): property names and error condition
 )
 
 // The builder trait is internally used to determine the best strategy to
@@ -70,9 +73,12 @@ func (t *builderTrait) Apply(e *Environment) error {
 		e.IntegrationKit.Status.Phase = v1.IntegrationKitPhaseError
 		e.IntegrationKit.Status.SetCondition("IntegrationKitPropertiesFormatValid", corev1.ConditionFalse,
 			"IntegrationKitPropertiesFormatValid", fmt.Sprintf("One or more properties where not formatted as expected: %s", err.Error()))
+<<<<<<< HEAD
 		if _, err := e.Client.CamelV1().IntegrationKits(e.IntegrationKit.Namespace).UpdateStatus(e.C, e.IntegrationKit, metav1.UpdateOptions{}); err != nil {
 			return err
 		}
+=======
+>>>>>>> refactor(trait): property names and error condition
 		return nil
 	}