This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 982759f fix(api): Remove deprecated deepcopy-gen markers
982759f is described below
commit 982759fd5629176263487d3af9824c0d03e1a2ea
Author: Antonin Stefanutti <[email protected]>
AuthorDate: Mon Feb 22 09:25:37 2021 +0100
fix(api): Remove deprecated deepcopy-gen markers
---
addons/strimzi/duck/v1beta1/doc.go | 2 +-
addons/strimzi/duck/v1beta1/duck_types.go | 10 ++++++----
pkg/apis/camel/v1/camelcatalog_types.go | 5 ++---
pkg/apis/camel/v1/doc.go | 2 +-
pkg/apis/camel/v1alpha1/doc.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 4 ++--
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/addons/strimzi/duck/v1beta1/doc.go
b/addons/strimzi/duck/v1beta1/doc.go
index cc460f0..0c9ca9f 100644
--- a/addons/strimzi/duck/v1beta1/doc.go
+++ b/addons/strimzi/duck/v1beta1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
*/
// Package duck contains a partial schema of the Strimzi APIs
-// +k8s:deepcopy-gen=package,register
+// +kubebuilder:object:generate=true
// +groupName=kafka.strimzi.io
package v1beta1
diff --git a/addons/strimzi/duck/v1beta1/duck_types.go
b/addons/strimzi/duck/v1beta1/duck_types.go
index 1828175..c691549 100644
--- a/addons/strimzi/duck/v1beta1/duck_types.go
+++ b/addons/strimzi/duck/v1beta1/duck_types.go
@@ -31,10 +31,10 @@ const (
StrimziListenerTypePlain = "plain"
)
-// +kubebuilder:object:root=true
// +genclient
// +genclient:onlyVerbs=get,list,watch
// +genclient:noStatus
+// +kubebuilder:object:root=true
// KafkaTopic is the duck of a KafkaTopic
type KafkaTopic struct {
@@ -42,7 +42,8 @@ type KafkaTopic struct {
metav1.ObjectMeta `json:"metadata,omitempty"`
}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
+
// KafkaTopicList contains a list of KafkaTopic
type KafkaTopicList struct {
metav1.TypeMeta `json:",inline"`
@@ -50,10 +51,10 @@ type KafkaTopicList struct {
Items []KafkaTopic `json:"items"`
}
-// +kubebuilder:object:root=true
// +genclient
// +genclient:onlyVerbs=get,list,watch
// +genclient:noStatus
+// +kubebuilder:object:root=true
// Kafka is the duck of a Kafka
type Kafka struct {
@@ -74,7 +75,8 @@ type KafkaStatusListener struct {
Type string `json:"type,omitempty"`
}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
+
// KafkaList contains a list of Kafka
type KafkaList struct {
metav1.TypeMeta `json:",inline"`
diff --git a/pkg/apis/camel/v1/camelcatalog_types.go
b/pkg/apis/camel/v1/camelcatalog_types.go
index e824943..04f1e19 100644
--- a/pkg/apis/camel/v1/camelcatalog_types.go
+++ b/pkg/apis/camel/v1/camelcatalog_types.go
@@ -75,9 +75,8 @@ type CamelCatalogSpec struct {
type CamelCatalogStatus struct {
}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +k8s:openapi-gen=true
// +genclient
+// +kubebuilder:object:root=true
//
+kubebuilder:resource:path=camelcatalogs,scope=Namespaced,shortName=cc,categories=kamel;camel
// +kubebuilder:subresource:status
// +kubebuilder:storageversion
@@ -93,7 +92,7 @@ type CamelCatalog struct {
Spec CamelCatalogSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
// CamelCatalogList contains a list of CamelCatalog
type CamelCatalogList struct {
diff --git a/pkg/apis/camel/v1/doc.go b/pkg/apis/camel/v1/doc.go
index 452afb3..1f4fbdc 100644
--- a/pkg/apis/camel/v1/doc.go
+++ b/pkg/apis/camel/v1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
*/
// Package v1 contains API Schema definitions for the camel v1 API group
-// +k8s:deepcopy-gen=package,register
+// +kubebuilder:object:generate=true
// +groupName=camel.apache.org
package v1
diff --git a/pkg/apis/camel/v1alpha1/doc.go b/pkg/apis/camel/v1alpha1/doc.go
index c9e1c78..bbde762 100644
--- a/pkg/apis/camel/v1alpha1/doc.go
+++ b/pkg/apis/camel/v1alpha1/doc.go
@@ -16,6 +16,6 @@ limitations under the License.
*/
// Package v1alpha1 contains API Schema definitions for the camel v1alpha1 API
group
-// +k8s:deepcopy-gen=package,register
+// +kubebuilder:object:generate=true
// +groupName=camel.apache.org
package v1alpha1
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index 06789f2..8fea2ac 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -108,8 +108,8 @@ const (
KameletBindingPhaseReady KameletBindingPhase = "Ready"
)
-// +kubebuilder:object:root=true
// +genclient
+// +kubebuilder:object:root=true
//
+kubebuilder:resource:path=kameletbindings,scope=Namespaced,shortName=klb,categories=kamel;camel
// +kubebuilder:subresource:status
//
+kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="The
Kamelet Binding phase"
@@ -123,7 +123,7 @@ type KameletBinding struct {
Status KameletBindingStatus `json:"status,omitempty"`
}
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:object:root=true
// KameletBindingList contains a list of KameletBinding
type KameletBindingList struct {
