This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 224d0c03e243bb78fc21db3c82bf35199a366efd Author: Antonin Stefanutti <[email protected]> AuthorDate: Thu Jun 24 10:08:27 2021 +0200 chore(api): Remove obsolete failure field From Integration API --- .../crd/bases/camel.apache.org_integrations.yaml | 27 ---------------------- .../camel.apache.org_integrations.yaml | 27 ---------------------- helm/camel-k/crds/crd-integration.yaml | 27 ---------------------- pkg/apis/camel/v1/integration_types.go | 1 - pkg/apis/camel/v1/zz_generated.deepcopy.go | 25 ++++++++++++++++---- pkg/resources/resources.go | 5 ++-- 6 files changed, 22 insertions(+), 90 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index 27987cb..5c47ee3 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -5453,33 +5453,6 @@ spec: type: array digest: type: string - failure: - description: Failure -- - properties: - reason: - type: string - recovery: - description: FailureRecovery -- - properties: - attempt: - type: integer - attemptMax: - type: integer - attemptTime: - format: date-time - type: string - required: - - attempt - - attemptMax - type: object - time: - format: date-time - type: string - required: - - reason - - recovery - - time - type: object generatedResources: items: description: ResourceSpec -- diff --git a/deploy/olm-catalog/camel-k-dev/1.5.0-snapshot/camel.apache.org_integrations.yaml b/deploy/olm-catalog/camel-k-dev/1.5.0-snapshot/camel.apache.org_integrations.yaml index 27987cb..5c47ee3 100644 --- a/deploy/olm-catalog/camel-k-dev/1.5.0-snapshot/camel.apache.org_integrations.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.5.0-snapshot/camel.apache.org_integrations.yaml @@ -5453,33 +5453,6 @@ spec: type: array digest: type: string - failure: - description: Failure -- - properties: - reason: - type: string - recovery: - description: FailureRecovery -- - properties: - attempt: - type: integer - attemptMax: - type: integer - attemptTime: - format: date-time - type: string - required: - - attempt - - attemptMax - type: object - time: - format: date-time - type: string - required: - - reason - - recovery - - time - type: object generatedResources: items: description: ResourceSpec -- diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index 27987cb..5c47ee3 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -5453,33 +5453,6 @@ spec: type: array digest: type: string - failure: - description: Failure -- - properties: - reason: - type: string - recovery: - description: FailureRecovery -- - properties: - attempt: - type: integer - attemptMax: - type: integer - attemptTime: - format: date-time - type: string - required: - - attempt - - attemptMax - type: object - time: - format: date-time - type: string - required: - - reason - - recovery - - time - type: object generatedResources: items: description: ResourceSpec -- diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go index 63ff5f7..79005f6 100644 --- a/pkg/apis/camel/v1/integration_types.go +++ b/pkg/apis/camel/v1/integration_types.go @@ -56,7 +56,6 @@ type IntegrationStatus struct { 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"` diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index b345ede..49986cc 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -1150,11 +1150,6 @@ func (in *IntegrationStatus) DeepCopyInto(out *IntegrationStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.Failure != nil { - in, out := &in.Failure, &out.Failure - *out = new(Failure) - (*in).DeepCopyInto(*out) - } if in.Configuration != nil { in, out := &in.Configuration, &out.Configuration *out = make([]ConfigurationSpec, len(*in)) @@ -1594,6 +1589,26 @@ func (in *Task) DeepCopy() *Task { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Template) DeepCopyInto(out *Template) { + *out = *in + if in.RawMessage != nil { + in, out := &in.RawMessage, &out.RawMessage + *out = make(RawMessage, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Template. +func (in *Template) DeepCopy() *Template { + if in == nil { + return nil + } + out := new(Template) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TraitConfiguration) DeepCopyInto(out *TraitConfiguration) { *out = *in if in.RawMessage != nil { diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index c433238..98b601a 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -106,9 +106,9 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrations.yaml", modTime: time.Time{}, - uncompressedSize: 367853, + uncompressedSize: 366985, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x8a\x53\x4e\xea\x93\xb4\x11\x29\x3b\x99\x9d\xbb\xe3\x3b\xf5\xa5\x34\x92\x9c\xd5\x8d\x2d\xab\x2c\x25\xf9\x52\x4e\x36\x0b\x76\x83\x24\x56\xdd\x40\x2f\x80\xa6\xcc\xbd\xbe\xff\xfb\x2d\x1c\x00\xfd\xe0\xab\x81\x16\xe9\x38\x53\x8d\xa9\x9a\x98\x14\xfb\x34\x1e\xe7\x7d\x0e\xce\xf9\x12\x46\xfb\x1b\x5f\x7c\x09\xaf\x59\x42\xb9\xa2\x29\x68\x01\x7a\x4e\xe1\xbc\x20\xc9\x9c\xc2\x9d\x98\xea\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x8a\x53\x4e\xea\x93\xb4\x11\x29\x3b\x99\x9d\xbb\xe3\x3b\xf5\xa5\x34\x92\x9c\xd5\x8d\x2d\xab\x2c\x25\xf9\x52\x4e\x36\x0b\x76\x83\x24\x56\xdd\x40\x2f\x80\xa6\xcc\xbd\xbe\xff\xfb\x2d\x1c\x00\xfd\xe0\xab\x81\x16\xe9\x38\x53\x8d\xa9\x9a\x98\x14\xfb\x34\x1e\xe7\x7d\x0e\xce\xf9\x12\x46\xfb\x1b\x5f\x7c\x09\xaf\x59\x42\xb9\xa2\x29\x68\x01\x7a\x4e\xe1\xbc\x20\xc9\x9c\xc2\x9d\x98\xea\x [...] }, "/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_kameletbindings.yaml", @@ -490,7 +490,6 @@ var assets = func() http.FileSystem { fs["/addons"].(os.FileInfo), fs["/camel-catalog-1.7.0.yaml"].(os.FileInfo), fs["/camel-catalog-1.8.0-SNAPSHOT.yaml"].(os.FileInfo), - fs["/camel-catalog-1.9.0-SNAPSHOT.yaml"].(os.FileInfo), fs["/crd"].(os.FileInfo), fs["/default"].(os.FileInfo), fs["/manager"].(os.FileInfo),
