Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(trait): drop support for registry #5738

Merged
merged 1 commit into from
Aug 5, 2024
Merged

chore(trait): drop support for registry #5738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cmd/util/doc-gen/generators/traitmetadatagen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion docs/modules/ROOT/nav.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` +
Expand Down Expand Up @@ -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` +
Expand Down Expand Up @@ -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.
Expand Down
36 changes: 0 additions & 36 deletions docs/modules/traits/pages/registry.adoc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion helm/camel-k/crds/crd-integration-kit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions helm/camel-k/crds/crd-integration-platform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions helm/camel-k/crds/crd-integration-profile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm/camel-k/crds/crd-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm/camel-k/crds/crd-kamelet-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm/camel-k/crds/crd-pipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1/integrationkit_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/camel/v1/trait/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Loading