From 8defc66f975bd05d9625ecbf753169572a518185 Mon Sep 17 00:00:00 2001 From: Nicola Ferraro Date: Sat, 7 Mar 2020 01:08:27 +0100 Subject: [PATCH] Upgrade Camel K to 1.0.0-RC2 (#991) (#1000) * Upgrade Camel K to 1.0.0-RC2 * Upgrade Camel K to 1.0.0-RC2: update codegen * Upgrade Camel K to 1.0.0-RC2: add some logs to debug * Upgrade Camel K to 1.0.0-RC2: force Knative profile --- Gopkg.lock | 6 +- Gopkg.toml | 2 +- .../source/pkg/reconciler/camelsource_test.go | 2 +- .../pkg/reconciler/resources/integration.go | 2 +- .../reconciler/resources/integration_test.go | 2 +- ....0-RC1.yaml => 100-camel-k-1.0.0-RC2.yaml} | 4 +- test/e2e-tests.sh | 2 +- test/e2e/camel_source_test.go | 25 ++- .../camel-k/pkg/apis/camel/v1/build_types.go | 53 +++--- .../pkg/apis/camel/v1/build_types_support.go | 45 ++++- .../pkg/apis/camel/v1/camelcatalog_types.go | 29 ++- .../camel/v1/camelcatalog_types_support.go | 18 +- .../camel-k/pkg/apis/camel/v1/common_types.go | 37 ++-- .../pkg/apis/camel/v1/integration_types.go | 38 ++-- .../camel/v1/integration_types_support.go | 88 ++++++++- .../pkg/apis/camel/v1/integrationkit_types.go | 7 +- .../camel/v1/integrationkit_types_support.go | 45 ++++- .../camel/v1/integrationplatform_types.go | 15 +- .../v1/integrationplatform_types_support.go | 41 +++++ .../apis/camel/v1/zz_generated.deepcopy.go | 174 +++++++++++------- 20 files changed, 472 insertions(+), 163 deletions(-) rename test/config/{100-camel-k-1.0.0-RC1.yaml => 100-camel-k-1.0.0-RC2.yaml} (99%) diff --git a/Gopkg.lock b/Gopkg.lock index 0287ffdb1f..3685140f02 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -65,15 +65,15 @@ version = "v1.24.0" [[projects]] - digest = "1:e2c0a049c5ce352f6a387f7327d86ce2ce4371ec4584e89df7541ff911b397d7" + digest = "1:604d60aab399c8e32c5c6e84aa0d227cdf2dad6893cadff00034bc827c367b08" name = "github.com/apache/camel-k" packages = [ "pkg/apis/camel/v1", "pkg/apis/camel/v1/knative", ] pruneopts = "NUT" - revision = "f448eb9e21f8df79950e7b93ccafbaa922bdeea6" - version = "1.0.0-RC1" + revision = "24ddce5afb41c70a0bf30e06f74c6f380f5fd851" + version = "1.0.0-RC2" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index 0e056a0802..ea2f33eb23 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -141,7 +141,7 @@ required = [ [[constraint]] name = "github.com/apache/camel-k" - version = "1.0.0-RC1" + version = "1.0.0-RC2" # needed because pkg upgraded [[override]] diff --git a/camel/source/pkg/reconciler/camelsource_test.go b/camel/source/pkg/reconciler/camelsource_test.go index ae79977baf..6327f28b5d 100644 --- a/camel/source/pkg/reconciler/camelsource_test.go +++ b/camel/source/pkg/reconciler/camelsource_test.go @@ -522,7 +522,7 @@ func getRunningCamelKFlowIntegration(t *testing.T) *camelv1.Integration { Integration: &camelv1.IntegrationSpec{ Sources: []camelv1.SourceSpec{ { - Loader: "knative-source-yaml", + Loader: "knative-source", DataSpec: camelv1.DataSpec{ Name: "flow.yaml", Content: "- from:\n steps:\n - set-body:\n constant: Hello world\n uri: timer:tick?period=3s\n", diff --git a/camel/source/pkg/reconciler/resources/integration.go b/camel/source/pkg/reconciler/resources/integration.go index 21db24d207..bee231a4b4 100644 --- a/camel/source/pkg/reconciler/resources/integration.go +++ b/camel/source/pkg/reconciler/resources/integration.go @@ -57,7 +57,7 @@ func MakeIntegration(args *CamelArguments) (*camelv1.Integration, error) { return nil, err } spec.Sources = append(spec.Sources, camelv1.SourceSpec{ - Loader: "knative-source-yaml", + Loader: "knative-source", DataSpec: camelv1.DataSpec{ Name: "flow.yaml", Content: flowData, diff --git a/camel/source/pkg/reconciler/resources/integration_test.go b/camel/source/pkg/reconciler/resources/integration_test.go index 3d6ca01f45..c3c8abe58f 100644 --- a/camel/source/pkg/reconciler/resources/integration_test.go +++ b/camel/source/pkg/reconciler/resources/integration_test.go @@ -74,7 +74,7 @@ func TestMakeDeployment_sink(t *testing.T) { Kit: "test-kit", Sources: []camelv1.SourceSpec{ { - Loader: "knative-source-yaml", + Loader: "knative-source", DataSpec: camelv1.DataSpec{ Name: "flow.yaml", Content: "- from:\n uri: timer:tick\n", diff --git a/test/config/100-camel-k-1.0.0-RC1.yaml b/test/config/100-camel-k-1.0.0-RC2.yaml similarity index 99% rename from test/config/100-camel-k-1.0.0-RC1.yaml rename to test/config/100-camel-k-1.0.0-RC2.yaml index c74b1d4619..3a9f178f59 100644 --- a/test/config/100-camel-k-1.0.0-RC1.yaml +++ b/test/config/100-camel-k-1.0.0-RC2.yaml @@ -281,6 +281,8 @@ rules: resources: - events verbs: + - create + - patch - get - list - watch @@ -381,7 +383,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/apache/camel-k:1.0.0-RC1 + image: docker.io/apache/camel-k:1.0.0-RC2 imagePullPolicy: IfNotPresent name: camel-k-operator resources: {} diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index ea687c4092..11a2560a70 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -67,7 +67,7 @@ readonly KAFKA_CRD_CONFIG_DIR="$(mktemp -d)" readonly KAFKA_SOURCE_CRD_CONFIG_DIR="kafka/source/config" # CamelK installation -readonly CAMELK_INSTALLATION_CONFIG="test/config/100-camel-k-1.0.0-RC1.yaml" +readonly CAMELK_INSTALLATION_CONFIG="test/config/100-camel-k-1.0.0-RC2.yaml" # Camel source CRD config template directory readonly CAMEL_SOURCE_CRD_CONFIG_DIR="camel/source/config" diff --git a/test/e2e/camel_source_test.go b/test/e2e/camel_source_test.go index 0349e29305..16392da783 100644 --- a/test/e2e/camel_source_test.go +++ b/test/e2e/camel_source_test.go @@ -89,11 +89,31 @@ func TestCamelSource(t *testing.T) { t.Logf("Sleeping for 3s to let the timer tick at least once") time.Sleep(3 * time.Second) + pods, err := client.Kube.Kube.CoreV1().Pods(client.Namespace).List(meta.ListOptions{ + LabelSelector: "camel.apache.org/integration", + }) + if err != nil { + t.Fatalf("cannot get integration pod: %v", err) + } + if len(pods.Items) == 0 { + t.Fatalf("no integration pod found") + } + printPodLogs(t, client, pods.Items[0].Name, "integration") + if err := client.CheckLog(loggerPodName, lib.CheckerContains(body)); err != nil { + printPodLogs(t, client, pods.Items[0].Name, "integration") t.Fatalf("Strings %q not found in logs of logger pod %q: %v", body, loggerPodName, err) } } +func printPodLogs(t *testing.T, c *lib.Client, podName, containerName string) { + logs, err := c.Kube.PodLogs(podName, containerName, c.Namespace) + if err == nil { + t.Log(string(logs)) + } + t.Logf("End of pod %s logs", podName) +} + func createCamelSourceOrFail(c *lib.Client, camelSource *v1alpha1.CamelSource) { camelSourceClientSet, err := camelsourceclient.NewForConfig(c.Config) if err != nil { @@ -114,6 +134,9 @@ func createCamelPlatformOrFail(c *lib.Client, camelClient runtime.Client, camelS Name: "camel-k", Namespace: c.Namespace, }, + Spec: camelv1.IntegrationPlatformSpec{ + Profile: camelv1.TraitProfileKnative, + }, } if err := camelClient.Create(context.TODO(), &platform); err != nil { @@ -140,7 +163,7 @@ func createCamelKitOrFail(c *lib.Client, camelClient runtime.Client, camelSource "mvn:org.apache.camel.k/camel-k-runtime-knative", "mvn:org.apache.camel.k/camel-k-runtime-main", }, - Image: "docker.io/testcamelk/camel-k-kit-bosp6ks52uhp0rb7beeg:3590738", + Image: "docker.io/testcamelk/camel-k-kit-knative-timer:1.0.0-RC2", }, } diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types.go index c2d2756bca..204544232d 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types.go @@ -35,7 +35,7 @@ type BuildSpec struct { // Task -- type Task struct { Builder *BuilderTask `json:"builder,omitempty"` - Kaniko *KanikoTask `json:"kaniko,omitempty"` + Image *ImageTask `json:"image,omitempty"` } // BaseTask -- @@ -46,43 +46,44 @@ type BaseTask struct { VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"` } -// ImageTask -- -type ImageTask struct { - BaseTask `json:",inline"` - Image string `json:"image,omitempty"` - Args []string `json:"args,omitempty"` - Env []corev1.EnvVar `json:"env,omitempty"` +// ContainerTask -- +type ContainerTask struct { + BaseTask `json:",inline"` + Image string `json:"image,omitempty"` + Command []string `json:"command,omitempty"` + Args []string `json:"args,omitempty"` + Env []corev1.EnvVar `json:"env,omitempty"` + WorkingDir string `json:"workingDir,omitempty"` } -// KanikoTask -- -type KanikoTask struct { - ImageTask `json:",inline"` - BuiltImage string `json:"builtImage,omitempty"` +// ImageTask -- +type ImageTask struct { + ContainerTask `json:",inline"` + BuiltImage string `json:"builtImage,omitempty"` } // BuilderTask -- type BuilderTask struct { - BaseTask `json:",inline"` - Meta metav1.ObjectMeta `json:"meta,omitempty"` - Image string `json:"image,omitempty"` - BaseImage string `json:"baseImage,omitempty"` - CamelVersion string `json:"camelVersion,omitempty"` - RuntimeVersion string `json:"runtimeVersion,omitempty"` - RuntimeProvider *RuntimeProvider `json:"runtimeProvider,omitempty"` - Sources []SourceSpec `json:"sources,omitempty"` - Resources []ResourceSpec `json:"resources,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Steps []string `json:"steps,omitempty"` - Maven MavenSpec `json:"maven,omitempty"` - BuildDir string `json:"buildDir,omitempty"` - Properties map[string]string `json:"properties,omitempty"` - Timeout metav1.Duration `json:"timeout,omitempty"` + BaseTask `json:",inline"` + Meta metav1.ObjectMeta `json:"meta,omitempty"` + Image string `json:"image,omitempty"` + BaseImage string `json:"baseImage,omitempty"` + Runtime RuntimeSpec `json:"runtime,omitempty"` + Sources []SourceSpec `json:"sources,omitempty"` + Resources []ResourceSpec `json:"resources,omitempty"` + Dependencies []string `json:"dependencies,omitempty"` + Steps []string `json:"steps,omitempty"` + Maven MavenSpec `json:"maven,omitempty"` + BuildDir string `json:"buildDir,omitempty"` + Properties map[string]string `json:"properties,omitempty"` + Timeout metav1.Duration `json:"timeout,omitempty"` } // BuildStatus defines the observed state of Build type BuildStatus struct { Phase BuildPhase `json:"phase,omitempty"` Image string `json:"image,omitempty"` + Digest string `json:"digest,omitempty"` BaseImage string `json:"baseImage,omitempty"` Artifacts []Artifact `json:"artifacts,omitempty"` Error string `json:"error,omitempty"` diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types_support.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types_support.go index 85bc40594a..2c8243bdf7 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types_support.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/build_types_support.go @@ -26,8 +26,8 @@ import ( func (t *Task) GetName() string { if t.Builder != nil { return t.Builder.Name - } else if t.Kaniko != nil { - return t.Kaniko.Name + } else if t.Image != nil { + return t.Image.Name } return "" } @@ -142,3 +142,44 @@ func (in *BuildStatus) RemoveCondition(condType BuildConditionType) { in.Conditions = newConditions } + +var _ ResourceCondition = BuildCondition{} + +// GetConditions -- +func (in *BuildStatus) GetConditions() []ResourceCondition { + res := make([]ResourceCondition, 0, len(in.Conditions)) + for _, c := range in.Conditions { + res = append(res, c) + } + return res +} + +// GetType -- +func (c BuildCondition) GetType() string { + return string(c.Type) +} + +// GetStatus -- +func (c BuildCondition) GetStatus() corev1.ConditionStatus { + return c.Status +} + +// GetLastUpdateTime -- +func (c BuildCondition) GetLastUpdateTime() metav1.Time { + return c.LastUpdateTime +} + +// GetLastTransitionTime -- +func (c BuildCondition) GetLastTransitionTime() metav1.Time { + return c.LastTransitionTime +} + +// GetReason -- +func (c BuildCondition) GetReason() string { + return c.Reason +} + +// GetMessage -- +func (c BuildCondition) GetMessage() string { + return c.Message +} diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types.go index 1c5556ed8b..05c782cbb9 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types.go @@ -36,10 +36,8 @@ type CamelArtifactExclusion struct { // CamelArtifactDependency represent a maven's dependency type CamelArtifactDependency struct { - GroupID string `json:"groupId" yaml:"groupId"` - ArtifactID string `json:"artifactId" yaml:"artifactId"` - Version string `json:"version,omitempty" yaml:"version,omitempty"` - Exclusions []CamelArtifactExclusion `json:"exclusions,omitempty" yaml:"exclusions,omitempty"` + MavenArtifact `json:",inline" yaml:",inline"` + Exclusions []CamelArtifactExclusion `json:"exclusions,omitempty" yaml:"exclusions,omitempty"` } // CamelArtifact -- @@ -49,14 +47,21 @@ type CamelArtifact struct { Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"` DataFormats []string `json:"dataformats,omitempty" yaml:"dataformats,omitempty"` Dependencies []CamelArtifact `json:"dependencies,omitempty" yaml:"dependencies,omitempty"` + JavaTypes []string `json:"javaTypes,omitempty" yaml:"javaTypes,omitempty"` +} + +// CamelLoader -- +type CamelLoader struct { + MavenArtifact `json:",inline" yaml:",inline"` + Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"` + Dependencies []MavenArtifact `json:"dependencies,omitempty" yaml:"dependencies,omitempty"` } // CamelCatalogSpec defines the desired state of CamelCatalog type CamelCatalogSpec struct { - Version string `json:"version" yaml:"version"` - RuntimeVersion string `json:"runtimeVersion" yaml:"runtimeVersion"` - RuntimeProvider *RuntimeProvider `json:"runtimeProvider,omitempty" yaml:"runtimeProvider"` - Artifacts map[string]CamelArtifact `json:"artifacts" yaml:"artifacts"` + Runtime RuntimeSpec `json:"runtime" yaml:"runtime"` + Artifacts map[string]CamelArtifact `json:"artifacts" yaml:"artifacts"` + Loaders map[string]CamelLoader `json:"loaders" yaml:"loaders"` } // CamelCatalogStatus defines the observed state of CamelCatalog @@ -84,9 +89,17 @@ type CamelCatalogList struct { Items []CamelCatalog `json:"items"` } +// RuntimeProvider -- +type RuntimeProvider string + const ( // CamelCatalogKind -- CamelCatalogKind string = "CamelCatalog" + + // RuntimeProviderMain -- + RuntimeProviderMain RuntimeProvider = "main" + // RuntimeProviderQuarkus -- + RuntimeProviderQuarkus RuntimeProvider = "quarkus" ) func init() { diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types_support.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types_support.go index 7ee6ee89de..edda60f09c 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types_support.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/camelcatalog_types_support.go @@ -17,7 +17,11 @@ limitations under the License. package v1 -import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +import ( + "strings" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) // NewCamelCatalog -- func NewCamelCatalog(namespace string, name string) CamelCatalog { @@ -57,3 +61,15 @@ func NewCamelCatalogList() CamelCatalogList { }, } } + +// GetDependencyID returns a Camel K recognizable maven dependency for the artifact +func (a CamelArtifact) GetDependencyID() string { + artifactID := a.ArtifactID + if a.GroupID == "org.apache.camel" && strings.HasPrefix(artifactID, "camel-") { + return "camel:" + artifactID[6:] + } + if a.GroupID == "org.apache.camel.quarkus" && strings.HasPrefix(artifactID, "camel-quarkus-") { + return "camel-quarkus:" + artifactID[14:] + } + return "mvn:" + a.GroupID + ":" + artifactID + ":" + a.Version +} diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/common_types.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/common_types.go index 661a57f8ab..0bcc485b9c 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/common_types.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/common_types.go @@ -22,17 +22,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// RuntimeProvider -- -type RuntimeProvider struct { - Quarkus *QuarkusRuntimeProvider `json:"quarkus,omitempty"` -} - -// QuarkusRuntimeProvider -- -type QuarkusRuntimeProvider struct { - CamelQuarkusVersion string `json:"camelQuarkusVersion,omitempty" yaml:"camelQuarkusVersion"` - QuarkusVersion string `json:"quarkusVersion,omitempty" yaml:"quarkusVersion"` -} - // ConfigurationSpec -- type ConfigurationSpec struct { Type string `json:"type"` @@ -90,7 +79,33 @@ type ValueSource struct { SecretKeyRef *corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` } +// MavenArtifact -- +type MavenArtifact struct { + GroupID string `json:"groupId" yaml:"groupId"` + ArtifactID string `json:"artifactId" yaml:"artifactId"` + Version string `json:"version,omitempty" yaml:"version,omitempty"` +} + +// RuntimeSpec -- +type RuntimeSpec struct { + Version string `json:"version" yaml:"version"` + Provider RuntimeProvider `json:"provider" yaml:"provider"` + ApplicationClass string `json:"applicationClass" yaml:"applicationClass"` + Dependencies []MavenArtifact `json:"dependencies" yaml:"dependencies"` + Metadata map[string]string `json:"metadata,omitempty" yaml:"metadata,omitempty"` +} + const ( // ServiceTypeUser -- ServiceTypeUser = "user" ) + +// ResourceCondition is a common type for all conditions +type ResourceCondition interface { + GetType() string + GetStatus() corev1.ConditionStatus + GetLastUpdateTime() metav1.Time + GetLastTransitionTime() metav1.Time + GetReason() string + GetMessage() string +} diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types.go index dcb2739e0d..742c296571 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types.go @@ -40,22 +40,22 @@ 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"` + 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 @@ -180,6 +180,8 @@ const ( IntegrationConditionServiceAvailable IntegrationConditionType = "ServiceAvailable" // IntegrationConditionKnativeServiceAvailable -- IntegrationConditionKnativeServiceAvailable IntegrationConditionType = "KnativeServiceAvailable" + // IntegrationConditionCronJobAvailable -- + IntegrationConditionCronJobAvailable IntegrationConditionType = "CronJobAvailable" // IntegrationConditionExposureAvailable -- IntegrationConditionExposureAvailable IntegrationConditionType = "ExposureAvailable" // IntegrationConditionPrometheusAvailable -- @@ -213,6 +215,10 @@ const ( IntegrationConditionKnativeServiceAvailableReason string = "KnativeServiceAvailable" // IntegrationConditionKnativeServiceNotAvailableReason -- IntegrationConditionKnativeServiceNotAvailableReason string = "KnativeServiceNotAvailable" + // IntegrationConditionCronJobAvailableReason -- + IntegrationConditionCronJobAvailableReason string = "CronJobAvailableReason" + // IntegrationConditionCronJobNotAvailableReason -- + IntegrationConditionCronJobNotAvailableReason string = "CronJobNotAvailableReason" // IntegrationConditionPrometheusAvailableReason -- IntegrationConditionPrometheusAvailableReason string = "PrometheusAvailable" // IntegrationConditionJolokiaAvailableReason -- diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types_support.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types_support.go index f7238840b5..d04e1bcd16 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types_support.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integration_types_support.go @@ -18,6 +18,7 @@ limitations under the License. package v1 import ( + "fmt" "strings" corev1 "k8s.io/api/core/v1" @@ -50,11 +51,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 -- @@ -99,6 +109,26 @@ func (in *IntegrationSpec) AddDependency(dependency string) { in.Dependencies = append(in.Dependencies, newDep) } +// AddOrReplaceGeneratedResources -- +func (in *IntegrationStatus) AddOrReplaceGeneratedResources(resources ...ResourceSpec) { + newResources := make([]ResourceSpec, 0) + for _, resource := range resources { + replaced := false + for i, r := range in.GeneratedResources { + if r.Name == resource.Name { + in.GeneratedResources[i] = resource + replaced = true + break + } + } + if !replaced { + newResources = append(newResources, resource) + } + } + + in.GeneratedResources = append(in.GeneratedResources, newResources...) +} + // Configurations -- func (in *IntegrationSpec) Configurations() []ConfigurationSpec { if in == nil { @@ -180,12 +210,17 @@ func (in *Integration) SetIntegrationPlatform(platform *IntegrationPlatform) { // SetIntegrationKit -- func (in *Integration) SetIntegrationKit(kit *IntegrationKit) { cs := corev1.ConditionTrue - + message := kit.Name if kit.Status.Phase != IntegrationKitPhaseReady { cs = corev1.ConditionFalse + if kit.Status.Phase == IntegrationKitPhaseNone { + message = fmt.Sprintf("creating a new integration kit") + } else { + message = fmt.Sprintf("integration kit %s is in state %q", kit.Name, kit.Status.Phase) + } } - in.Status.SetCondition(IntegrationConditionKitAvailable, cs, IntegrationConditionKitAvailableReason, kit.Name) + in.Status.SetCondition(IntegrationConditionKitAvailable, cs, IntegrationConditionKitAvailableReason, message) in.Status.Kit = kit.Name in.Status.Image = kit.Status.Image } @@ -264,3 +299,44 @@ func (in *IntegrationStatus) RemoveCondition(condType IntegrationConditionType) in.Conditions = newConditions } + +var _ ResourceCondition = IntegrationCondition{} + +// GetConditions -- +func (in *IntegrationStatus) GetConditions() []ResourceCondition { + res := make([]ResourceCondition, 0, len(in.Conditions)) + for _, c := range in.Conditions { + res = append(res, c) + } + return res +} + +// GetType -- +func (c IntegrationCondition) GetType() string { + return string(c.Type) +} + +// GetStatus -- +func (c IntegrationCondition) GetStatus() corev1.ConditionStatus { + return c.Status +} + +// GetLastUpdateTime -- +func (c IntegrationCondition) GetLastUpdateTime() metav1.Time { + return c.LastUpdateTime +} + +// GetLastTransitionTime -- +func (c IntegrationCondition) GetLastTransitionTime() metav1.Time { + return c.LastTransitionTime +} + +// GetReason -- +func (c IntegrationCondition) GetReason() string { + return c.Reason +} + +// GetMessage -- +func (c IntegrationCondition) GetMessage() string { + return c.Message +} diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types.go index 5f3c046f4d..767cd6f4e9 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types.go @@ -42,9 +42,8 @@ type IntegrationKitStatus struct { Digest string `json:"digest,omitempty"` Artifacts []Artifact `json:"artifacts,omitempty"` Failure *Failure `json:"failure,omitempty"` - CamelVersion string `json:"camelVersion,omitempty"` RuntimeVersion string `json:"runtimeVersion,omitempty"` - RuntimeProvider *RuntimeProvider `json:"runtimeProvider,omitempty"` + RuntimeProvider RuntimeProvider `json:"runtimeProvider,omitempty"` Platform string `json:"platform,omitempty"` Conditions []IntegrationKitCondition `json:"conditions,omitempty"` Version string `json:"version,omitempty"` @@ -79,8 +78,8 @@ type IntegrationKitPhase string type IntegrationKitConditionType string const ( - // IntegrationKindKind -- - IntegrationKindKind string = "IntegrationKit" + // IntegrationKitKind -- + IntegrationKitKind string = "IntegrationKit" // IntegrationKitTypePlatform -- IntegrationKitTypePlatform = "platform" diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types_support.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types_support.go index 9c7864996e..fb310df5b6 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types_support.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationkit_types_support.go @@ -27,7 +27,7 @@ func NewIntegrationKit(namespace string, name string) IntegrationKit { return IntegrationKit{ TypeMeta: metav1.TypeMeta{ APIVersion: SchemeGroupVersion.String(), - Kind: IntegrationKindKind, + Kind: IntegrationKitKind, }, ObjectMeta: metav1.ObjectMeta{ Namespace: namespace, @@ -41,7 +41,7 @@ func NewIntegrationKitList() IntegrationKitList { return IntegrationKitList{ TypeMeta: metav1.TypeMeta{ APIVersion: SchemeGroupVersion.String(), - Kind: IntegrationKindKind, + Kind: IntegrationKitKind, }, } } @@ -155,3 +155,44 @@ func (in *IntegrationKitStatus) RemoveCondition(condType IntegrationKitCondition in.Conditions = newConditions } + +var _ ResourceCondition = IntegrationKitCondition{} + +// GetConditions -- +func (in *IntegrationKitStatus) GetConditions() []ResourceCondition { + res := make([]ResourceCondition, 0, len(in.Conditions)) + for _, c := range in.Conditions { + res = append(res, c) + } + return res +} + +// GetType -- +func (c IntegrationKitCondition) GetType() string { + return string(c.Type) +} + +// GetStatus -- +func (c IntegrationKitCondition) GetStatus() corev1.ConditionStatus { + return c.Status +} + +// GetLastUpdateTime -- +func (c IntegrationKitCondition) GetLastUpdateTime() metav1.Time { + return c.LastUpdateTime +} + +// GetLastTransitionTime -- +func (c IntegrationKitCondition) GetLastTransitionTime() metav1.Time { + return c.LastTransitionTime +} + +// GetReason -- +func (c IntegrationKitCondition) GetReason() string { + return c.Reason +} + +// GetMessage -- +func (c IntegrationKitCondition) GetMessage() string { + return c.Message +} diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types.go index f0e0212165..ff9afbb46a 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types.go @@ -104,9 +104,8 @@ var AllTraitProfiles = []TraitProfile{TraitProfileKubernetes, TraitProfileKnativ type IntegrationPlatformBuildSpec struct { BuildStrategy IntegrationPlatformBuildStrategy `json:"buildStrategy,omitempty"` PublishStrategy IntegrationPlatformBuildPublishStrategy `json:"publishStrategy,omitempty"` - CamelVersion string `json:"camelVersion,omitempty"` RuntimeVersion string `json:"runtimeVersion,omitempty"` - RuntimeProvider *RuntimeProvider `json:"runtimeProvider,omitempty"` + RuntimeProvider RuntimeProvider `json:"runtimeProvider,omitempty"` BaseImage string `json:"baseImage,omitempty"` Properties map[string]string `json:"properties,omitempty"` Registry IntegrationPlatformRegistrySpec `json:"registry,omitempty"` @@ -131,7 +130,6 @@ type IntegrationPlatformBuildStrategy string const ( // IntegrationPlatformBuildStrategyRoutine performs the build in a routine IntegrationPlatformBuildStrategyRoutine = "routine" - // IntegrationPlatformBuildStrategyPod performs the build in a pod IntegrationPlatformBuildStrategyPod = "pod" ) @@ -140,11 +138,12 @@ const ( type IntegrationPlatformBuildPublishStrategy string const ( - // IntegrationPlatformBuildPublishStrategyS2I performs a OpenShift binary S2I build - IntegrationPlatformBuildPublishStrategyS2I = "S2I" - - // IntegrationPlatformBuildPublishStrategyKaniko performs + // IntegrationPlatformBuildPublishStrategyBuildah + IntegrationPlatformBuildPublishStrategyBuildah = "Buildah" + // IntegrationPlatformBuildPublishStrategyKaniko IntegrationPlatformBuildPublishStrategyKaniko = "Kaniko" + // IntegrationPlatformBuildPublishStrategyS2I + IntegrationPlatformBuildPublishStrategyS2I = "S2I" ) // IntegrationPlatformPhase -- @@ -157,6 +156,8 @@ const ( // IntegrationPlatformKind -- IntegrationPlatformKind string = "IntegrationPlatform" + // IntegrationPlatformPhaseNone -- + IntegrationPlatformPhaseNone IntegrationPlatformPhase = "" // IntegrationPlatformPhaseCreating -- IntegrationPlatformPhaseCreating IntegrationPlatformPhase = "Creating" // IntegrationPlatformPhaseWarming -- diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types_support.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types_support.go index 8a2a80668f..ce33114c8c 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types_support.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/integrationplatform_types_support.go @@ -202,3 +202,44 @@ func (m MavenSpec) GetTimeout() metav1.Duration { } return *m.Timeout } + +var _ ResourceCondition = IntegrationPlatformCondition{} + +// GetConditions -- +func (in *IntegrationPlatformStatus) GetConditions() []ResourceCondition { + res := make([]ResourceCondition, 0, len(in.Conditions)) + for _, c := range in.Conditions { + res = append(res, c) + } + return res +} + +// GetType -- +func (c IntegrationPlatformCondition) GetType() string { + return string(c.Type) +} + +// GetStatus -- +func (c IntegrationPlatformCondition) GetStatus() corev1.ConditionStatus { + return c.Status +} + +// GetLastUpdateTime -- +func (c IntegrationPlatformCondition) GetLastUpdateTime() metav1.Time { + return c.LastUpdateTime +} + +// GetLastTransitionTime -- +func (c IntegrationPlatformCondition) GetLastTransitionTime() metav1.Time { + return c.LastTransitionTime +} + +// GetReason -- +func (c IntegrationPlatformCondition) GetReason() string { + return c.Reason +} + +// GetMessage -- +func (c IntegrationPlatformCondition) GetMessage() string { + return c.Message +} diff --git a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/zz_generated.deepcopy.go b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/zz_generated.deepcopy.go index 9f80a6aaa7..dbe9858415 100644 --- a/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/apache/camel-k/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -202,11 +202,7 @@ func (in *BuilderTask) DeepCopyInto(out *BuilderTask) { *out = *in in.BaseTask.DeepCopyInto(&out.BaseTask) in.Meta.DeepCopyInto(&out.Meta) - if in.RuntimeProvider != nil { - in, out := &in.RuntimeProvider, &out.RuntimeProvider - *out = new(RuntimeProvider) - (*in).DeepCopyInto(*out) - } + in.Runtime.DeepCopyInto(&out.Runtime) if in.Sources != nil { in, out := &in.Sources, &out.Sources *out = make([]SourceSpec, len(*in)) @@ -275,6 +271,11 @@ func (in *CamelArtifact) DeepCopyInto(out *CamelArtifact) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.JavaTypes != nil { + in, out := &in.JavaTypes, &out.JavaTypes + *out = make([]string, len(*in)) + copy(*out, *in) + } return } @@ -291,6 +292,7 @@ func (in *CamelArtifact) DeepCopy() *CamelArtifact { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CamelArtifactDependency) DeepCopyInto(out *CamelArtifactDependency) { *out = *in + out.MavenArtifact = in.MavenArtifact if in.Exclusions != nil { in, out := &in.Exclusions, &out.Exclusions *out = make([]CamelArtifactExclusion, len(*in)) @@ -389,11 +391,7 @@ func (in *CamelCatalogList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CamelCatalogSpec) DeepCopyInto(out *CamelCatalogSpec) { *out = *in - if in.RuntimeProvider != nil { - in, out := &in.RuntimeProvider, &out.RuntimeProvider - *out = new(RuntimeProvider) - (*in).DeepCopyInto(*out) - } + in.Runtime.DeepCopyInto(&out.Runtime) if in.Artifacts != nil { in, out := &in.Artifacts, &out.Artifacts *out = make(map[string]CamelArtifact, len(*in)) @@ -401,6 +399,13 @@ func (in *CamelCatalogSpec) DeepCopyInto(out *CamelCatalogSpec) { (*out)[key] = *val.DeepCopy() } } + if in.Loaders != nil { + in, out := &in.Loaders, &out.Loaders + *out = make(map[string]CamelLoader, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } return } @@ -430,6 +435,33 @@ func (in *CamelCatalogStatus) DeepCopy() *CamelCatalogStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CamelLoader) DeepCopyInto(out *CamelLoader) { + *out = *in + out.MavenArtifact = in.MavenArtifact + if in.Languages != nil { + in, out := &in.Languages, &out.Languages + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Dependencies != nil { + in, out := &in.Dependencies, &out.Dependencies + *out = make([]MavenArtifact, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CamelLoader. +func (in *CamelLoader) DeepCopy() *CamelLoader { + if in == nil { + return nil + } + out := new(CamelLoader) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CamelScheme) DeepCopyInto(out *CamelScheme) { *out = *in @@ -462,6 +494,40 @@ func (in *ConfigurationSpec) DeepCopy() *ConfigurationSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ContainerTask) DeepCopyInto(out *ContainerTask) { + *out = *in + in.BaseTask.DeepCopyInto(&out.BaseTask) + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Env != nil { + in, out := &in.Env, &out.Env + *out = make([]corev1.EnvVar, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerTask. +func (in *ContainerTask) DeepCopy() *ContainerTask { + if in == nil { + return nil + } + out := new(ContainerTask) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DataSpec) DeepCopyInto(out *DataSpec) { *out = *in @@ -516,19 +582,7 @@ func (in *FailureRecovery) DeepCopy() *FailureRecovery { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ImageTask) DeepCopyInto(out *ImageTask) { *out = *in - in.BaseTask.DeepCopyInto(&out.BaseTask) - if in.Args != nil { - in, out := &in.Args, &out.Args - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]corev1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } + in.ContainerTask.DeepCopyInto(&out.ContainerTask) return } @@ -718,11 +772,6 @@ func (in *IntegrationKitStatus) DeepCopyInto(out *IntegrationKitStatus) { *out = new(Failure) (*in).DeepCopyInto(*out) } - if in.RuntimeProvider != nil { - in, out := &in.RuntimeProvider, &out.RuntimeProvider - *out = new(RuntimeProvider) - (*in).DeepCopyInto(*out) - } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions *out = make([]IntegrationKitCondition, len(*in)) @@ -807,11 +856,6 @@ func (in *IntegrationPlatform) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IntegrationPlatformBuildSpec) DeepCopyInto(out *IntegrationPlatformBuildSpec) { *out = *in - if in.RuntimeProvider != nil { - in, out := &in.RuntimeProvider, &out.RuntimeProvider - *out = new(RuntimeProvider) - (*in).DeepCopyInto(*out) - } if in.Properties != nil { in, out := &in.Properties, &out.Properties *out = make(map[string]string, len(*in)) @@ -1052,16 +1096,16 @@ func (in *IntegrationStatus) DeepCopyInto(out *IntegrationStatus) { *out = make([]SourceSpec, len(*in)) copy(*out, *in) } + if in.GeneratedResources != nil { + in, out := &in.GeneratedResources, &out.GeneratedResources + *out = make([]ResourceSpec, len(*in)) + copy(*out, *in) + } if in.Failure != nil { in, out := &in.Failure, &out.Failure *out = new(Failure) (*in).DeepCopyInto(*out) } - if in.RuntimeProvider != nil { - in, out := &in.RuntimeProvider, &out.RuntimeProvider - *out = new(RuntimeProvider) - (*in).DeepCopyInto(*out) - } if in.Configuration != nil { in, out := &in.Configuration, &out.Configuration *out = make([]ConfigurationSpec, len(*in)) @@ -1093,18 +1137,17 @@ func (in *IntegrationStatus) DeepCopy() *IntegrationStatus { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *KanikoTask) DeepCopyInto(out *KanikoTask) { +func (in *MavenArtifact) DeepCopyInto(out *MavenArtifact) { *out = *in - in.ImageTask.DeepCopyInto(&out.ImageTask) return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KanikoTask. -func (in *KanikoTask) DeepCopy() *KanikoTask { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MavenArtifact. +func (in *MavenArtifact) DeepCopy() *MavenArtifact { if in == nil { return nil } - out := new(KanikoTask) + out := new(MavenArtifact) in.DeepCopyInto(out) return out } @@ -1131,22 +1174,6 @@ func (in *MavenSpec) DeepCopy() *MavenSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *QuarkusRuntimeProvider) DeepCopyInto(out *QuarkusRuntimeProvider) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QuarkusRuntimeProvider. -func (in *QuarkusRuntimeProvider) DeepCopy() *QuarkusRuntimeProvider { - if in == nil { - return nil - } - out := new(QuarkusRuntimeProvider) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ResourceSpec) DeepCopyInto(out *ResourceSpec) { *out = *in @@ -1165,22 +1192,29 @@ func (in *ResourceSpec) DeepCopy() *ResourceSpec { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RuntimeProvider) DeepCopyInto(out *RuntimeProvider) { +func (in *RuntimeSpec) DeepCopyInto(out *RuntimeSpec) { *out = *in - if in.Quarkus != nil { - in, out := &in.Quarkus, &out.Quarkus - *out = new(QuarkusRuntimeProvider) - **out = **in + if in.Dependencies != nil { + in, out := &in.Dependencies, &out.Dependencies + *out = make([]MavenArtifact, len(*in)) + copy(*out, *in) + } + if in.Metadata != nil { + in, out := &in.Metadata, &out.Metadata + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } } return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuntimeProvider. -func (in *RuntimeProvider) DeepCopy() *RuntimeProvider { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuntimeSpec. +func (in *RuntimeSpec) DeepCopy() *RuntimeSpec { if in == nil { return nil } - out := new(RuntimeProvider) + out := new(RuntimeSpec) in.DeepCopyInto(out) return out } @@ -1210,9 +1244,9 @@ func (in *Task) DeepCopyInto(out *Task) { *out = new(BuilderTask) (*in).DeepCopyInto(*out) } - if in.Kaniko != nil { - in, out := &in.Kaniko, &out.Kaniko - *out = new(KanikoTask) + if in.Image != nil { + in, out := &in.Image, &out.Image + *out = new(ImageTask) (*in).DeepCopyInto(*out) } return