feat: change KameletBinding name to Binding

Closes apache#2625

.github/actions/kamel-cleanup/clean-orphan-resources.sh

@@ -2,7 +2,7 @@
 
 set +e
 
-resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds kameletbindings"
+resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds bindings"
 
 #
 # Loop through the resource types

PROJECT

@@ -19,7 +19,7 @@ resources:
   kind: Integration
   version: v1
 - group: camel
-  kind: KameletBinding
+  kind: Binding
   version: v1alpha1
 - group: camel
   kind: Kamelet

addons/keda/keda.go

@@ -279,9 +279,9 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
 	if err != nil {
 		return err
 	}
-	if ctrlRef.Kind == camelv1alpha1.KameletBindingKind {
+	if ctrlRef.Kind == camelv1alpha1.BindingKind {
 		scale.ObjectMeta.Name = ctrlRef.Name
-		_, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("kameletbindings").GroupResource(), &scale, metav1.UpdateOptions{})
+		_, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
 		if err != nil {
 			return err
 		}
@@ -297,7 +297,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
 
 func (t *kedaTrait) getTopControllerReference(e *trait.Environment) *v1.ObjectReference {
 	for _, o := range e.Integration.OwnerReferences {
-		if o.Kind == camelv1alpha1.KameletBindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
+		if o.Kind == camelv1alpha1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
 			return &v1.ObjectReference{
 				APIVersion: o.APIVersion,
 				Kind:       o.Kind,

addons/keda/keda_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/apache/camel-k/v2/addons/keda/duck/v1alpha1"
 	camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
 	camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
-	"github.com/apache/camel-k/v2/pkg/controller/kameletbinding"
+	"github.com/apache/camel-k/v2/pkg/controller/binding"
 	"github.com/apache/camel-k/v2/pkg/trait"
 	"github.com/apache/camel-k/v2/pkg/util/camel"
 	"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -203,16 +203,16 @@ func TestKameletAutoDetection(t *testing.T) {
 	assert.Contains(t, secret.StringData, "cc")
 }
 
-func TestKameletBindingAutoDetection(t *testing.T) {
+func TestBindingAutoDetection(t *testing.T) {
 	keda, _ := NewKedaTrait().(*kedaTrait)
 	keda.Enabled = pointer.Bool(true)
 	logEndpoint := "log:info"
-	klb := camelv1alpha1.KameletBinding{
+	klb := camelv1alpha1.Binding{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: "test",
 			Name:      "my-binding",
 		},
-		Spec: camelv1alpha1.KameletBindingSpec{
+		Spec: camelv1alpha1.BindingSpec{
 			Source: camelv1alpha1.Endpoint{
 				Ref: &corev1.ObjectReference{
 					Kind:       "Kamelet",
@@ -277,7 +277,7 @@ func TestKameletBindingAutoDetection(t *testing.T) {
 			},
 		})
 
-	it, err := kameletbinding.CreateIntegrationFor(env.Ctx, env.Client, &klb)
+	it, err := binding.CreateIntegrationFor(env.Ctx, env.Client, &klb)
 	assert.NoError(t, err)
 	assert.NotNil(t, it)
 	env.Integration = it
@@ -362,7 +362,7 @@ func TestHackKLBReplicas(t *testing.T) {
 	})
 	keda.HackControllerReplicas = pointer.Bool(true)
 	env := createBasicTestEnvironment(
-		&camelv1alpha1.KameletBinding{
+		&camelv1alpha1.Binding{
 			ObjectMeta: metav1.ObjectMeta{
 				Namespace: "test",
 				Name:      "my-klb",
@@ -375,7 +375,7 @@ func TestHackKLBReplicas(t *testing.T) {
 				OwnerReferences: []metav1.OwnerReference{
 					{
 						APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
-						Kind:       "KameletBinding",
+						Kind:       "Binding",
 						Name:       "my-klb",
 					},
 				},
@@ -392,7 +392,7 @@ func TestHackKLBReplicas(t *testing.T) {
 	assert.NoError(t, keda.Apply(env))
 	scalesClient, err := env.Client.ScalesClient()
 	assert.NoError(t, err)
-	sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("kameletbindings").GroupResource(), "my-klb", metav1.GetOptions{})
+	sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), "my-klb", metav1.GetOptions{})
 	assert.NoError(t, err)
 	assert.Equal(t, int32(1), sc.Spec.Replicas)
 }

addons/strimzi/strimzi.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-// BindingProvider allows to connect to a Kafka topic via KameletBinding.
+// BindingProvider allows to connect to a Kafka topic via Binding.
 type BindingProvider struct {
 	Client internalclientset.Interface
 }

config/crd/bases/camel.apache.org_kameletbindings.yaml → config/crd/bases/camel.apache.org_bindings.yaml

@@ -23,23 +23,23 @@ metadata:
   creationTimestamp: null
   labels:
     app: camel-k
-  name: kameletbindings.camel.apache.org
+  name: bindings.camel.apache.org
 spec:
   group: camel.apache.org
   names:
     categories:
     - kamel
     - camel
-    kind: KameletBinding
-    listKind: KameletBindingList
-    plural: kameletbindings
+    kind: Binding
+    listKind: BindingList
+    plural: bindings
     shortNames:
     - klb
-    singular: kameletbinding
+    singular: binding
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - description: The Kamelet Binding phase
+    - description: TheBinding phase
       jsonPath: .status.phase
       name: Phase
       type: string
@@ -50,7 +50,7 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: KameletBinding is the Schema for the kamelets binding API
+        description: Binding is the Schema for the kamelets binding API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +65,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: the specification of a KameletBinding
+            description: the specification of a Binding
             properties:
               errorHandler:
                 description: ErrorHandler is an optional handler called upon an error
@@ -8410,12 +8410,12 @@ spec:
                 type: array
             type: object
           status:
-            description: the status of a KameletBinding
+            description: the status of a Binding
             properties:
               conditions:
                 description: Conditions --
                 items:
-                  description: KameletBindingCondition describes the state of a resource
+                  description: BindingCondition describes the state of a resource
                     at a certain point.
                   properties:
                     lastTransitionTime:
@@ -8498,7 +8498,7 @@ spec:
                       description: Status of the condition, one of True, False, Unknown.
                       type: string
                     type:
-                      description: Type of kameletBinding condition.
+                      description: Type of binding condition.
                       type: string
                   required:
                   - status
@@ -8507,7 +8507,7 @@ spec:
                 type: array
               observedGeneration:
                 description: ObservedGeneration is the most recent generation observed
-                  for this KameletBinding.
+                  for this Binding.
                 format: int64
                 type: integer
               phase:

config/crd/kustomization.yaml

@@ -23,5 +23,5 @@ resources:
 - bases/camel.apache.org_integrationkits.yaml
 - bases/camel.apache.org_integrationplatforms.yaml
 - bases/camel.apache.org_integrations.yaml
-- bases/camel.apache.org_kameletbindings.yaml
+- bases/camel.apache.org_bindings.yaml
 - bases/camel.apache.org_kamelets.yaml

config/manifests/bases/camel-k.clusterserviceversion.yaml

@@ -23,7 +23,7 @@ metadata:
     categories: Integration & Delivery
     certified: "false"
     containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
-    createdAt: 2023-04-03T16:32:08Z
+    createdAt: 2023-03-24T09:36:48Z
     description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
       with serverless superpowers.
     operators.operatorframework.io/builder: operator-sdk-v1.16.0
@@ -63,10 +63,10 @@ spec:
       kind: Integration
       name: integrations.camel.apache.org
       version: v1
-    - description: KameletBinding is the Schema for the kamelets binding API
-      displayName: Kamelet Binding
-      kind: KameletBinding
-      name: kameletbindings.camel.apache.org
+    - description: Binding is the Schema for the kamelets binding API
+      displayName: Binding
+      kind: Binding
+      name: bindings.camel.apache.org
       version: v1alpha1
     - description: Kamelet is the Schema for the kamelets API
       displayName: Kamelet

config/rbac/openshift/operator-role-openshift.yaml

@@ -29,7 +29,7 @@ rules:
   - integrationkits/finalizers
   - integrationplatforms/finalizers
   - integrations/finalizers
-  - kameletbindings/finalizers
+  - bindings/finalizers
   verbs:
   - update
 - apiGroups:

config/rbac/operator-role.yaml

@@ -30,7 +30,7 @@ rules:
   - integrationkits
   - integrationplatforms
   - integrations
-  - kameletbindings
+  - bindings
   - kamelets
   verbs:
   - create
@@ -54,8 +54,8 @@ rules:
   - integrationplatforms/status
   - integrations/scale
   - integrations/status
-  - kameletbindings/status
-  - kameletbindings/scale
+  - bindings/status
+  - bindings/scale
   - kamelets/status
   verbs:
   - get

config/rbac/user-cluster-role.yaml

@@ -33,7 +33,7 @@ rules:
   - integrationkits
   - integrationplatforms
   - integrations
-  - kameletbindings
+  - bindings
   - kamelets
   verbs:
   - create
@@ -53,8 +53,8 @@ rules:
   - integrationplatforms/status
   - integrations/scale
   - integrations/status
-  - kameletbindings/scale
-  - kameletbindings/status
+  - bindings/scale
+  - bindings/status
   - kamelets/status
   verbs:
   - get

config/samples/bases/camel_v1_kameletbinding.yaml

@@ -16,7 +16,7 @@
 # ---------------------------------------------------------------------------
 
 apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
 metadata:
   name: example
 spec:

config/samples/kustomization.yaml

@@ -27,7 +27,7 @@ resources:
 - bases/camel_v1_camelcatalog.yaml
 - bases/camel_v1_build.yaml
 - bases/camel_v1_kamelet.yaml
-- bases/camel_v1_kameletbinding.yaml
+- bases/camel_v1_binding.yaml
 
 patchesStrategicMerge:
 - patch-integration-platform.yaml