Move KameletRepositorySpec to common types

The spec may be used by other types in the future, too

docs/modules/ROOT/partials/apis/camel-k-crds.adoc

@@ -2694,7 +2694,7 @@ string
 
 
 a base image that can be used as base layer for all images.
-It can be useful if you want to provide some custom base image with further utility softwares
+It can be useful if you want to provide some custom base image with further utility software
 
 |`registry` +
 *xref:#_camel_apache_org_v1_RegistrySpec[RegistrySpec]*
@@ -2821,30 +2821,6 @@ A human-readable message indicating details about the transition.
 IntegrationPlatformConditionType defines the type of condition.
 
 
-[#_camel_apache_org_v1_IntegrationPlatformKameletRepositorySpec]
-=== IntegrationPlatformKameletRepositorySpec
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_IntegrationPlatformKameletSpec, IntegrationPlatformKameletSpec>>
-
-IntegrationPlatformKameletRepositorySpec defines the location of the Kamelet catalog to use.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`uri` +
-string
-|
-
-
-the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
-
-
-|===
-
 [#_camel_apache_org_v1_IntegrationPlatformKameletSpec]
 === IntegrationPlatformKameletSpec
 
@@ -2860,7 +2836,7 @@ IntegrationPlatformKameletSpec define the behavior for all the Kamelets controll
 |Description
 
 |`repositories` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformKameletRepositorySpec[[\]IntegrationPlatformKameletRepositorySpec]*
+*xref:#_camel_apache_org_v1_KameletRepositorySpec[[\]KameletRepositorySpec]*
 |
 
 
@@ -3722,6 +3698,30 @@ string
 the default value of the property (if any)
 
 
+|===
+
+[#_camel_apache_org_v1_KameletRepositorySpec]
+=== KameletRepositorySpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformKameletSpec, IntegrationPlatformKameletSpec>>
+
+KameletRepositorySpec defines the location of the Kamelet catalog to use.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`uri` +
+string
+|
+
+
+the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
+
+
 |===
 
 [#_camel_apache_org_v1_KameletSpec]

docs/modules/ROOT/partials/apis/crds-html.adoc

@@ -2818,14 +2818,14 @@ string
 <div>
 <p>IntegrationPlatformConditionType &ndash;</p>
 </div>
-<h3 id="camel.apache.org/v1.IntegrationPlatformKameletRepositorySpec">IntegrationPlatformKameletRepositorySpec
+<h3 id="camel.apache.org/v1.KameletRepositorySpec">KameletRepositorySpec
 </h3>
 <p>
 (<em>Appears on:</em>
 <a href="#camel.apache.org/v1.IntegrationPlatformKameletSpec">IntegrationPlatformKameletSpec</a>)
 </p>
 <div>
-<p>IntegrationPlatformKameletRepositorySpec &ndash;</p>
+<p>KameletRepositorySpec &ndash;</p>
 </div>
 <table>
 <thead>
@@ -2868,8 +2868,8 @@ string
 <td>
 <code>repositories</code><br/>
 <em>
-<a href="#camel.apache.org/v1.IntegrationPlatformKameletRepositorySpec">
-[]IntegrationPlatformKameletRepositorySpec
+<a href="#camel.apache.org/v1.KameletRepositorySpec">
+[]KameletRepositorySpec
 </a>
 </em>
 </td>

helm/camel-k/crds/crd-integration-platform.yaml

@@ -95,7 +95,7 @@ spec:
                   baseImage:
                     description: a base image that can be used as base layer for all
                       images. It can be useful if you want to provide some custom
-                      base image with further utility softwares
+                      base image with further utility software
                     type: string
                   buildCatalogToolTimeout:
                     description: 'the timeout (in seconds) to use when creating the
@@ -434,8 +434,8 @@ spec:
                   repositories:
                     description: remote repository used to retrieve Kamelet catalog
                     items:
-                      description: IntegrationPlatformKameletRepositorySpec defines
-                        the location of the Kamelet catalog to use.
+                      description: KameletRepositorySpec defines the location of the
+                        Kamelet catalog to use.
                       properties:
                         uri:
                           description: the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
@@ -1915,7 +1915,7 @@ spec:
                   baseImage:
                     description: a base image that can be used as base layer for all
                       images. It can be useful if you want to provide some custom
-                      base image with further utility softwares
+                      base image with further utility software
                     type: string
                   buildCatalogToolTimeout:
                     description: 'the timeout (in seconds) to use when creating the
@@ -2294,8 +2294,8 @@ spec:
                   repositories:
                     description: remote repository used to retrieve Kamelet catalog
                     items:
-                      description: IntegrationPlatformKameletRepositorySpec defines
-                        the location of the Kamelet catalog to use.
+                      description: KameletRepositorySpec defines the location of the
+                        Kamelet catalog to use.
                       properties:
                         uri:
                           description: the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER

pkg/apis/camel/v1/common_types.go

@@ -105,6 +105,12 @@ var BuildOrderStrategies = []BuildOrderStrategy{
 	BuildOrderStrategySequential,
 }
 
+// KameletRepositorySpec defines the location of the Kamelet catalog to use.
+type KameletRepositorySpec struct {
+	// the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
+	URI string `json:"uri,omitempty"`
+}
+
 // ConfigurationSpec represents a generic configuration specification.
 type ConfigurationSpec struct {
 	// represents the type of configuration, ie: property, configmap, secret, ...

pkg/apis/camel/v1/integrationplatform_types.go

@@ -120,7 +120,7 @@ type IntegrationPlatformBuildSpec struct {
 	// the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5)
 	RuntimeProvider RuntimeProvider `json:"runtimeProvider,omitempty"`
 	// a base image that can be used as base layer for all images.
-	// It can be useful if you want to provide some custom base image with further utility softwares
+	// It can be useful if you want to provide some custom base image with further utility software
 	BaseImage string `json:"baseImage,omitempty"`
 	// the image registry used to push/pull Integration images
 	Registry RegistrySpec `json:"registry,omitempty"`
@@ -140,13 +140,7 @@ type IntegrationPlatformBuildSpec struct {
 // IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform.
 type IntegrationPlatformKameletSpec struct {
 	// remote repository used to retrieve Kamelet catalog
-	Repositories []IntegrationPlatformKameletRepositorySpec `json:"repositories,omitempty"`
-}
-
-// IntegrationPlatformKameletRepositorySpec defines the location of the Kamelet catalog to use.
-type IntegrationPlatformKameletRepositorySpec struct {
-	// the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
-	URI string `json:"uri,omitempty"`
+	Repositories []KameletRepositorySpec `json:"repositories,omitempty"`
 }
 
 // IntegrationPlatformBuildPublishStrategy defines the strategy used to package and publish an Integration base image.

pkg/cmd/kamelet_add_repo.go

@@ -93,7 +93,7 @@ func (o *kameletAddRepoCommandOptions) run(cmd *cobra.Command, args []string) er
 		if err := checkURI(uri, platform.Spec.Kamelet.Repositories); err != nil {
 			return err
 		}
-		platform.Spec.Kamelet.Repositories = append(platform.Spec.Kamelet.Repositories, v1.IntegrationPlatformKameletRepositorySpec{
+		platform.Spec.Kamelet.Repositories = append(platform.Spec.Kamelet.Repositories, v1.KameletRepositorySpec{
 			URI: uri,
 		})
 	}
@@ -134,7 +134,7 @@ func (o *kameletUpdateRepoCommandOptions) findIntegrationPlatform(cmd *cobra.Com
 	return nil, nil
 }
 
-func checkURI(uri string, repositories []v1.IntegrationPlatformKameletRepositorySpec) error {
+func checkURI(uri string, repositories []v1.KameletRepositorySpec) error {
 	if !kameletRepositoryURIRegexp.MatchString(uri) {
 		return fmt.Errorf("malformed Kamelet repository uri %s, the expected format is github:owner/repo[/path_to_kamelets_folder][@version]", uri)
 	}

pkg/cmd/kamelet_add_repo_test.go

@@ -67,7 +67,7 @@ func TestKameletAddRepoNonExistingFlag(t *testing.T) {
 }
 
 func TestKameletAddRepoInvalidRepositoryURI(t *testing.T) {
-	repositories := []v1.IntegrationPlatformKameletRepositorySpec{}
+	repositories := []v1.KameletRepositorySpec{}
 	assert.NotNil(t, checkURI("foo", repositories))
 	assert.NotNil(t, checkURI("github", repositories))
 	assert.NotNil(t, checkURI("github:", repositories))
@@ -76,15 +76,15 @@ func TestKameletAddRepoInvalidRepositoryURI(t *testing.T) {
 }
 
 func TestKameletAddRepoValidRepositoryURI(t *testing.T) {
-	repositories := []v1.IntegrationPlatformKameletRepositorySpec{}
+	repositories := []v1.KameletRepositorySpec{}
 	assert.Nil(t, checkURI("github:foo/bar", repositories))
 	assert.Nil(t, checkURI("github:foo/bar/some/path", repositories))
 	assert.Nil(t, checkURI("github:foo/[email protected]", repositories))
 	assert.Nil(t, checkURI("github:foo/bar/some/[email protected]", repositories))
 }
 
 func TestKameletAddRepoDuplicateRepositoryURI(t *testing.T) {
-	repositories := []v1.IntegrationPlatformKameletRepositorySpec{{URI: "github:foo/bar"}}
+	repositories := []v1.KameletRepositorySpec{{URI: "github:foo/bar"}}
 	assert.NotNil(t, checkURI("github:foo/bar", repositories))
 	assert.Nil(t, checkURI("github:foo/bar2", repositories))
 }

pkg/cmd/kamelet_remove_repo.go

@@ -88,7 +88,7 @@ func (o *kameletRemoveRepoCommandOptions) run(cmd *cobra.Command, args []string)
 	return c.Update(o.Context, platform)
 }
 
-func getURIIndex(uri string, repositories []v1.IntegrationPlatformKameletRepositorySpec) (int, error) {
+func getURIIndex(uri string, repositories []v1.KameletRepositorySpec) (int, error) {
 	for i, repo := range repositories {
 		if repo.URI == uri {
 			return i, nil

pkg/cmd/kamelet_remove_repo_test.go

@@ -67,19 +67,19 @@ func TestKameletRemoveRepoNonExistingFlag(t *testing.T) {
 }
 
 func TestKameletRemoveRepoURINotFoundEmpty(t *testing.T) {
-	repositories := []v1.IntegrationPlatformKameletRepositorySpec{}
+	repositories := []v1.KameletRepositorySpec{}
 	_, err := getURIIndex("foo", repositories)
 	assert.NotNil(t, err)
 }
 
 func TestKameletRemoveRepoURINotFoundNotEmpty(t *testing.T) {
-	repositories := []v1.IntegrationPlatformKameletRepositorySpec{{URI: "github:foo/bar"}}
+	repositories := []v1.KameletRepositorySpec{{URI: "github:foo/bar"}}
 	_, err := getURIIndex("foo", repositories)
 	assert.NotNil(t, err)
 }
 
 func TestKameletRemoveRepoURIFound(t *testing.T) {
-	repositories := []v1.IntegrationPlatformKameletRepositorySpec{{URI: "github:foo/bar1"}, {URI: "github:foo/bar2"}, {URI: "github:foo/bar3"}}
+	repositories := []v1.KameletRepositorySpec{{URI: "github:foo/bar1"}, {URI: "github:foo/bar2"}, {URI: "github:foo/bar3"}}
 	i, err := getURIIndex("github:foo/bar2", repositories)
 	assert.Nil(t, err)
 	assert.Equal(t, 1, i)

pkg/kamelet/repository/repository_test.go

@@ -190,9 +190,9 @@ func createTestContext(uris ...string) []runtime.Object {
 		},
 	}
 	if len(uris) > 0 {
-		repos := make([]v1.IntegrationPlatformKameletRepositorySpec, 0, len(uris))
+		repos := make([]v1.KameletRepositorySpec, 0, len(uris))
 		for _, uri := range uris {
-			repos = append(repos, v1.IntegrationPlatformKameletRepositorySpec{
+			repos = append(repos, v1.KameletRepositorySpec{
 				URI: uri,
 			})
 		}

pkg/platform/defaults.go

@@ -358,7 +358,7 @@ func setPlatformDefaults(p *v1.IntegrationPlatform, verbose bool) error {
 
 	if len(p.Status.Kamelet.Repositories) == 0 {
 		log.Debugf("Integration Platform %s [%s]: setting kamelet repositories", p.Name, p.Namespace)
-		p.Status.Kamelet.Repositories = append(p.Status.Kamelet.Repositories, v1.IntegrationPlatformKameletRepositorySpec{
+		p.Status.Kamelet.Repositories = append(p.Status.Kamelet.Repositories, v1.KameletRepositorySpec{
 			URI: repository.DefaultRemoteRepository,
 		})
 	}