This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c03a992063aeed2f6e37cebd0039e1d05f284e65 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Mon Mar 16 18:01:01 2020 +0100 Introduce capabilities to Integration status --- pkg/apis/camel/v1/common_types.go | 7 +++++++ pkg/apis/camel/v1/common_types_support.go | 11 +++++++++++ pkg/apis/camel/v1/integration_types.go | 1 + pkg/apis/camel/v1/zz_generated.deepcopy.go | 5 +++++ 4 files changed, 24 insertions(+) diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go index 70f9c21..1cc3123 100644 --- a/pkg/apis/camel/v1/common_types.go +++ b/pkg/apis/camel/v1/common_types.go @@ -105,6 +105,13 @@ type Capability struct { const ( // ServiceTypeUser -- ServiceTypeUser = "user" + + // CapabilityRest -- + CapabilityRest = "rest" + // CapabilityHealth -- + CapabilityHealth = "health" + // CapabilityCron -- + CapabilityCron = "cron" ) // ResourceCondition is a common type for all conditions diff --git a/pkg/apis/camel/v1/common_types_support.go b/pkg/apis/camel/v1/common_types_support.go index 05db9e5..d47c8b4 100644 --- a/pkg/apis/camel/v1/common_types_support.go +++ b/pkg/apis/camel/v1/common_types_support.go @@ -38,3 +38,14 @@ func NewErrorFailure(err error) *Failure { Time: metav1.Now(), } } + +// CapabilityDependencies --- +func (in *RuntimeSpec) CapabilityDependencies(capability string) []MavenArtifact { + deps := make([]MavenArtifact, 0) + + if capability, ok := in.Capabilities[capability]; ok { + deps = append(deps, capability.Dependencies...) + } + + return deps +} diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go index 2be9742..91491cd 100644 --- a/pkg/apis/camel/v1/integration_types.go +++ b/pkg/apis/camel/v1/integration_types.go @@ -56,6 +56,7 @@ type IntegrationStatus struct { Conditions []IntegrationCondition `json:"conditions,omitempty"` Version string `json:"version,omitempty"` Replicas *int32 `json:"replicas,omitempty"` + Capabilities []string `json:"capabilities,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index ca39df9..6e941cd 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -1162,6 +1162,11 @@ func (in *IntegrationStatus) DeepCopyInto(out *IntegrationStatus) { *out = new(int32) **out = **in } + if in.Capabilities != nil { + in, out := &in.Capabilities, &out.Capabilities + *out = make([]string, len(*in)) + copy(*out, *in) + } return }