chore(trait): drop support for registry

apache · Aug 5, 2024 · d289658 · d289658
1 parent 54a344f
commit d289658
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 923 deletions.
diff --git a/cmd/util/doc-gen/generators/traitmetadatagen.go b/cmd/util/doc-gen/generators/traitmetadatagen.go
@@ -70,12 +70,16 @@ func (g *traitMetaDataGen) Filename() string {
 }
 
 func (g *traitMetaDataGen) Filter(context *generator.Context, t *types.Type) bool {
+	filter := false
 	for _, c := range t.CommentLines {
 		if strings.Contains(c, tagTrait) {
-			return true
+			filter = true
+		}
+		if strings.Contains(c, tagInternal) {
+			filter = false
 		}
 	}
-	return false
+	return filter
 }
 
 func (g *traitMetaDataGen) GenerateType(context *generator.Context, t *types.Type, out io.Writer) error {

diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
@@ -83,7 +83,6 @@
 ** xref:traits:prometheus.adoc[Prometheus]
 ** xref:traits:pull-secret.adoc[Pull Secret]
 ** xref:traits:quarkus.adoc[Quarkus]
-** xref:traits:registry.adoc[Registry]
 ** xref:traits:resume.adoc[Resume]
 ** xref:traits:route.adoc[Route]
 ** xref:traits:security-context.adoc[Security Context]

diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -2714,7 +2714,7 @@ NOTE: Compiling to a native executable, requires at least 4GiB of memory, so the
 |
 
 
-The Registry trait sets up Maven to use the Image registry as a Maven repository.
+The Registry trait sets up Maven to use the Image registry as a Maven repository (support removed since version 2.5.0).
 Deprecated: use jvm trait or read documentation.
 
 |`addons` +
@@ -5946,7 +5946,7 @@ The configuration of Quarkus trait
 |
 
 
-The configuration of Registry trait
+The configuration of Registry trait (support removed since version 2.5.0).
 Deprecated: use jvm trait or read documentation.
 
 |`route` +
@@ -8383,7 +8383,7 @@ Deprecated: for backward compatibility.
 * <<#_camel_apache_org_v1_IntegrationKitTraits, IntegrationKitTraits>>
 * <<#_camel_apache_org_v1_Traits, Traits>>
 
-WARNING: The Registry trait is **deprecated** and will removed in future release versions.
+WARNING: The Registry trait was deprecated in version 2.2.0 and is no longer active since version 2.5.0.
 
 The Registry trait sets up Maven to use the Image registry
 as a Maven repository.

diff --git a/docs/modules/traits/pages/registry.adoc b/docs/modules/traits/pages/registry.adoc
diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml
@@ -423,7 +423,7 @@ spec:
                     type: object
                   registry:
                     description: |-
-                      The Registry trait sets up Maven to use the Image registry as a Maven repository.
+                      The Registry trait sets up Maven to use the Image registry as a Maven repository (support removed since version 2.5.0).
                       Deprecated: use jvm trait or read documentation.
                     properties:
                       configuration:

diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml
@@ -1890,7 +1890,7 @@ spec:
                     type: object
                   registry:
                     description: |-
-                      The configuration of Registry trait
+                      The configuration of Registry trait (support removed since version 2.5.0).
                       Deprecated: use jvm trait or read documentation.
                     properties:
                       configuration:
@@ -3988,7 +3988,7 @@ spec:
                     type: object
                   registry:
                     description: |-
-                      The configuration of Registry trait
+                      The configuration of Registry trait (support removed since version 2.5.0).
                       Deprecated: use jvm trait or read documentation.
                     properties:
                       configuration:

diff --git a/helm/camel-k/crds/crd-integration-profile.yaml b/helm/camel-k/crds/crd-integration-profile.yaml
@@ -1765,7 +1765,7 @@ spec:
                     type: object
                   registry:
                     description: |-
-                      The configuration of Registry trait
+                      The configuration of Registry trait (support removed since version 2.5.0).
                       Deprecated: use jvm trait or read documentation.
                     properties:
                       configuration:
@@ -3745,7 +3745,7 @@ spec:
                     type: object
                   registry:
                     description: |-
-                      The configuration of Registry trait
+                      The configuration of Registry trait (support removed since version 2.5.0).
                       Deprecated: use jvm trait or read documentation.
                     properties:
                       configuration:

diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
@@ -7781,7 +7781,7 @@ spec:
                     type: object
                   registry:
                     description: |-
-                      The configuration of Registry trait
+                      The configuration of Registry trait (support removed since version 2.5.0).
                       Deprecated: use jvm trait or read documentation.
                     properties:
                       configuration:

diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -7854,7 +7854,7 @@ spec:
                         type: object
                       registry:
                         description: |-
-                          The configuration of Registry trait
+                          The configuration of Registry trait (support removed since version 2.5.0).
                           Deprecated: use jvm trait or read documentation.
                         properties:
                           configuration:

diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml
@@ -7852,7 +7852,7 @@ spec:
                         type: object
                       registry:
                         description: |-
-                          The configuration of Registry trait
+                          The configuration of Registry trait (support removed since version 2.5.0).
                           Deprecated: use jvm trait or read documentation.
                         properties:
                           configuration:

diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
@@ -233,7 +233,7 @@ type Traits struct {
 	PullSecret *trait.PullSecretTrait `property:"pull-secret" json:"pull-secret,omitempty"`
 	// The configuration of Quarkus trait
 	Quarkus *trait.QuarkusTrait `property:"quarkus" json:"quarkus,omitempty"`
-	// The configuration of Registry trait
+	// The configuration of Registry trait (support removed since version 2.5.0).
 	// Deprecated: use jvm trait or read documentation.
 	Registry *trait.RegistryTrait `property:"registry" json:"registry,omitempty"`
 	// The configuration of Route trait

diff --git a/pkg/apis/camel/v1/integrationkit_types.go b/pkg/apis/camel/v1/integrationkit_types.go
@@ -88,7 +88,7 @@ type IntegrationKitTraits struct {
 	// It's enabled by default.
 	// NOTE: Compiling to a native executable, requires at least 4GiB of memory, so the Pod running the native build must have enough memory available.
 	Quarkus *trait.QuarkusTrait `property:"quarkus" json:"quarkus,omitempty"`
-	// The Registry trait sets up Maven to use the Image registry as a Maven repository.
+	// The Registry trait sets up Maven to use the Image registry as a Maven repository (support removed since version 2.5.0).
 	// Deprecated: use jvm trait or read documentation.
 	Registry *trait.RegistryTrait `property:"registry" json:"registry,omitempty"`
 	// The collection of addon trait configurations

diff --git a/pkg/apis/camel/v1/trait/registry.go b/pkg/apis/camel/v1/trait/registry.go
@@ -17,13 +17,13 @@ limitations under the License.
 
 package trait
 
-// WARNING: The Registry trait is **deprecated** and will removed in future release versions.
+// WARNING: The Registry trait was deprecated in version 2.2.0 and is no longer active since version 2.5.0.
 //
 // The Registry trait sets up Maven to use the Image registry
 // as a Maven repository.
 //
 // +camel-k:trait=registry.
-// +camel-k:deprecated=2.2.0.
+// +camel-k:internal.
 type RegistryTrait struct {
 	Trait `property:",squash" json:",inline"`
 }