This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ac9a9fab1aabda6dd7999d20695896c3d0870322 Author: Michael Anstis <[email protected]> AuthorDate: Fri Mar 3 10:48:49 2023 +0000 Run 'make generate' with [email protected] --- .../strimzi/duck/client/internalclientset/fake/register.go | 14 +++++++------- .../duck/client/internalclientset/scheme/register.go | 14 +++++++------- config/crd/bases/camel.apache.org_kameletbindings.yaml | 6 ++++++ config/crd/bases/camel.apache.org_kamelets.yaml | 4 ++++ docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 7 +++++++ helm/camel-k/crds/crd-kamelet-binding.yaml | 6 ++++++ helm/camel-k/crds/crd-kamelet.yaml | 3 ++- .../applyconfiguration/camel/v1alpha1/jsonschemaprop.go | 9 +++++++++ 8 files changed, 48 insertions(+), 15 deletions(-) diff --git a/addons/strimzi/duck/client/internalclientset/fake/register.go b/addons/strimzi/duck/client/internalclientset/fake/register.go index b03a9f805..04aa54821 100644 --- a/addons/strimzi/duck/client/internalclientset/fake/register.go +++ b/addons/strimzi/duck/client/internalclientset/fake/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/addons/strimzi/duck/client/internalclientset/scheme/register.go b/addons/strimzi/duck/client/internalclientset/scheme/register.go index bb376affd..7c58dd36c 100644 --- a/addons/strimzi/duck/client/internalclientset/scheme/register.go +++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index e8f8ae8c5..b84e5b9ae 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -7749,6 +7749,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: @@ -7966,6 +7968,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: @@ -8188,6 +8192,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml index 7a6f89f13..20b9230b4 100644 --- a/config/crd/bases/camel.apache.org_kamelets.yaml +++ b/config/crd/bases/camel.apache.org_kamelets.yaml @@ -94,6 +94,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: @@ -311,6 +313,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: diff --git a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc index 557e5f6ed..c9daa48e7 100644 --- a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc +++ b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc @@ -438,6 +438,13 @@ string +|`deprecated` + +bool +| + + + + |`description` + string | diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index e8f8ae8c5..b84e5b9ae 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -7749,6 +7749,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: @@ -7966,6 +7968,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: @@ -8188,6 +8192,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml index 2a9a35c5e..20b9230b4 100644 --- a/helm/camel-k/crds/crd-kamelet.yaml +++ b/helm/camel-k/crds/crd-kamelet.yaml @@ -96,7 +96,6 @@ spec: x-kubernetes-preserve-unknown-fields: true deprecated: type: boolean - default: false description: type: string enum: @@ -314,6 +313,8 @@ spec: description: default is a default value for undefined object fields. x-kubernetes-preserve-unknown-fields: true + deprecated: + type: boolean description: type: string enum: diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprop.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprop.go index baf451cb5..68aee96a4 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprop.go +++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprop.go @@ -27,6 +27,7 @@ import ( // with apply. type JSONSchemaPropApplyConfiguration struct { ID *string `json:"id,omitempty"` + Deprecated *bool `json:"deprecated,omitempty"` Description *string `json:"description,omitempty"` Type *string `json:"type,omitempty"` Format *string `json:"format,omitempty"` @@ -65,6 +66,14 @@ func (b *JSONSchemaPropApplyConfiguration) WithID(value string) *JSONSchemaPropA return b } +// WithDeprecated sets the Deprecated field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Deprecated field is set to the value of the last call. +func (b *JSONSchemaPropApplyConfiguration) WithDeprecated(value bool) *JSONSchemaPropApplyConfiguration { + b.Deprecated = &value + return b +} + // WithDescription sets the Description field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Description field is set to the value of the last call.
