[camel-k] 01/02: chore(regen): regen deepcopy

[nf...@apache.org]

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 44eb5d81a18c88af0dcdbb4df581660dc65fd227
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Dec 13 16:35:15 2019 +0100

    chore(regen): regen deepcopy
---
 pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 20 +++++++++++++++-----
 pkg/trait/quarkus.go                             |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index fff2f0a..a930cce 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -5,7 +5,8 @@
 package v1alpha1
 
 import (
-	v1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -723,7 +724,11 @@ func (in *IntegrationPlatformBuildSpec) DeepCopyInto(out *IntegrationPlatformBui
 		}
 	}
 	out.Registry = in.Registry
-	out.Timeout = in.Timeout
+	if in.Timeout != nil {
+		in, out := &in.Timeout, &out.Timeout
+		*out = new(v1.Duration)
+		**out = **in
+	}
 	in.Maven.DeepCopyInto(&out.Maven)
 	if in.KanikoBuildCache != nil {
 		in, out := &in.KanikoBuildCache, &out.KanikoBuildCache
@@ -864,6 +869,7 @@ func (in *IntegrationPlatformSpec) DeepCopy() *IntegrationPlatformSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *IntegrationPlatformStatus) DeepCopyInto(out *IntegrationPlatformStatus) {
 	*out = *in
+	in.IntegrationPlatformSpec.DeepCopyInto(&out.IntegrationPlatformSpec)
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
 		*out = make([]IntegrationPlatformCondition, len(*in))
@@ -994,7 +1000,11 @@ func (in *IntegrationStatus) DeepCopy() *IntegrationStatus {
 func (in *MavenSpec) DeepCopyInto(out *MavenSpec) {
 	*out = *in
 	in.Settings.DeepCopyInto(&out.Settings)
-	out.Timeout = in.Timeout
+	if in.Timeout != nil {
+		in, out := &in.Timeout, &out.Timeout
+		*out = new(v1.Duration)
+		**out = **in
+	}
 	return
 }
 
@@ -1107,12 +1117,12 @@ func (in *ValueSource) DeepCopyInto(out *ValueSource) {
 	*out = *in
 	if in.ConfigMapKeyRef != nil {
 		in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef
-		*out = new(v1.ConfigMapKeySelector)
+		*out = new(corev1.ConfigMapKeySelector)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.SecretKeyRef != nil {
 		in, out := &in.SecretKeyRef, &out.SecretKeyRef
-		*out = new(v1.SecretKeySelector)
+		*out = new(corev1.SecretKeySelector)
 		(*in).DeepCopyInto(*out)
 	}
 	return
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index 72a5be7..97d7395 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -205,7 +205,7 @@ func (t *quarkusTrait) determineQuarkusVersion(e *Environment) string {
 		e.Platform.Status.Build.RuntimeProvider.Quarkus.QuarkusVersion != "" {
 		return e.Platform.Status.Build.RuntimeProvider.Quarkus.QuarkusVersion
 	}
-	return defaults.QuarkusVersionConstraint
+	return defaults.DefaultQuarkusVersion
 }
 
 func (t *quarkusTrait) determineCamelQuarkusVersion(e *Environment) string {
@@ -224,5 +224,5 @@ func (t *quarkusTrait) determineCamelQuarkusVersion(e *Environment) string {
 		e.Platform.Status.Build.RuntimeProvider.Quarkus.CamelQuarkusVersion != "" {
 		return e.Platform.Status.Build.RuntimeProvider.Quarkus.CamelQuarkusVersion
 	}
-	return defaults.CamelQuarkusVersionConstraint
+	return defaults.DefaultCamelQuarkusVersion
 }