chore(it): Report generated resources in integration status

apache · Jan 22, 2020 · 19727c7 · 19727c7
1 parent 6889b5d
commit 19727c7
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 21 deletions.
diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go
@@ -40,22 +40,23 @@ type IntegrationSpec struct {
 
 // IntegrationStatus defines the observed state of Integration
 type IntegrationStatus struct {
-	Phase            IntegrationPhase       `json:"phase,omitempty"`
-	Digest           string                 `json:"digest,omitempty"`
-	Image            string                 `json:"image,omitempty"`
-	Dependencies     []string               `json:"dependencies,omitempty"`
-	Profile          TraitProfile           `json:"profile,omitempty"`
-	Kit              string                 `json:"kit,omitempty"`
-	Platform         string                 `json:"platform,omitempty"`
-	GeneratedSources []SourceSpec           `json:"generatedSources,omitempty"`
-	Failure          *Failure               `json:"failure,omitempty"`
-	CamelVersion     string                 `json:"camelVersion,omitempty"`
-	RuntimeVersion   string                 `json:"runtimeVersion,omitempty"`
-	RuntimeProvider  *RuntimeProvider       `json:"runtimeProvider,omitempty"`
-	Configuration    []ConfigurationSpec    `json:"configuration,omitempty"`
-	Conditions       []IntegrationCondition `json:"conditions,omitempty"`
-	Version          string                 `json:"version,omitempty"`
-	Replicas         *int32                 `json:"replicas,omitempty"`
+	Phase              IntegrationPhase       `json:"phase,omitempty"`
+	Digest             string                 `json:"digest,omitempty"`
+	Image              string                 `json:"image,omitempty"`
+	Dependencies       []string               `json:"dependencies,omitempty"`
+	Profile            TraitProfile           `json:"profile,omitempty"`
+	Kit                string                 `json:"kit,omitempty"`
+	Platform           string                 `json:"platform,omitempty"`
+	GeneratedSources   []SourceSpec           `json:"generatedSources,omitempty"`
+	GeneratedResources []ResourceSpec         `json:"generatedResources,omitempty"`
+	Failure            *Failure               `json:"failure,omitempty"`
+	CamelVersion       string                 `json:"camelVersion,omitempty"`
+	RuntimeVersion     string                 `json:"runtimeVersion,omitempty"`
+	RuntimeProvider    *RuntimeProvider       `json:"runtimeProvider,omitempty"`
+	Configuration      []ConfigurationSpec    `json:"configuration,omitempty"`
+	Conditions         []IntegrationCondition `json:"conditions,omitempty"`
+	Version            string                 `json:"version,omitempty"`
+	Replicas           *int32                 `json:"replicas,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/camel/v1/integration_types_support.go b/pkg/apis/camel/v1/integration_types_support.go
@@ -50,11 +50,20 @@ func NewIntegrationList() IntegrationList {
 
 // Sources return a new slice containing all the sources associated to the integration
 func (in *Integration) Sources() []SourceSpec {
-	allSources := make([]SourceSpec, 0, len(in.Spec.Sources)+len(in.Status.GeneratedSources))
-	allSources = append(allSources, in.Spec.Sources...)
-	allSources = append(allSources, in.Status.GeneratedSources...)
+	sources := make([]SourceSpec, 0, len(in.Spec.Sources)+len(in.Status.GeneratedSources))
+	sources = append(sources, in.Spec.Sources...)
+	sources = append(sources, in.Status.GeneratedSources...)
 
-	return allSources
+	return sources
+}
+
+// Resources return a new slice containing all the resources associated to the integration
+func (in *Integration) Resources() []ResourceSpec {
+	resources := make([]ResourceSpec, 0, len(in.Spec.Resources)+len(in.Status.GeneratedResources))
+	resources = append(resources, in.Spec.Resources...)
+	resources = append(resources, in.Status.GeneratedResources...)
+
+	return resources
 }
 
 // AddSource --

diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
@@ -456,7 +456,7 @@ func (e *Environment) ConfigureVolumesAndMounts(vols *[]corev1.Volume, mnts *[]c
 		})
 	}
 
-	for i, r := range e.Integration.Spec.Resources {
+	for i, r := range e.Integration.Resources() {
 		if r.Type != v1.ResourceTypeData {
 			continue
 		}