diff --git a/cmd/util/doc-gen/generators/traitmetadatagen.go b/cmd/util/doc-gen/generators/traitmetadatagen.go index dcc48e3175..964bf95c21 100644 --- a/cmd/util/doc-gen/generators/traitmetadatagen.go +++ b/cmd/util/doc-gen/generators/traitmetadatagen.go @@ -109,8 +109,7 @@ func (g *traitMetaDataGen) getTraitID(t *types.Type) string { } func (g *traitMetaDataGen) buildDescription(t *types.Type, traitID string, td *traitMetaData) { - desc := []string(nil) - desc = append(desc, filterOutTagsAndComments(t.CommentLines)...) + desc := filterOutTagsAndComments(t.CommentLines) td.Name = traitID td.Description = "" for _, line := range desc { diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 6a58ee2add..5d2e88a335 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -23,7 +23,7 @@ string string |`Build` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -65,7 +65,7 @@ string string |`CamelCatalog` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -107,7 +107,7 @@ string string |`Integration` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -152,7 +152,7 @@ string string |`IntegrationKit` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -197,7 +197,7 @@ string string |`IntegrationPlatform` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -240,7 +240,7 @@ string string |`IntegrationProfile` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -282,7 +282,7 @@ string string |`Kamelet` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -325,7 +325,7 @@ string string |`Pipe` |`metadata` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* | @@ -525,21 +525,21 @@ BuildCondition describes the state of a resource at a certain point. Type of integration condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -716,6 +716,7 @@ The sequence of tasks (pipeline) to be performed. The configuration that should be used to perform the Build. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility |`toolImage` + @@ -724,6 +725,7 @@ string The container image to be used to run the build. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility |`operatorNamespace` + @@ -732,10 +734,11 @@ string The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation). + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility |`timeout` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#duration-v1-meta[Kubernetes meta/v1.Duration]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#duration-v1-meta[Kubernetes meta/v1.Duration]* | @@ -749,7 +752,8 @@ int32 | -the maximum amount of parallel running builds started by this operator instance +the maximum amount of parallel running builds started by this operator instance. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility @@ -833,7 +837,7 @@ the error description (if any) the reason of the failure (if any) |`startedAt` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -878,6 +882,7 @@ will take care of producing the expected Camel/Camel-Quarkus runtime. * <<#_camel_apache_org_v1_Task, Task>> BuildahTask is used to configure Buildah. + Deprecated: no longer in use. [cols="2,2a",options="header"] @@ -1147,21 +1152,21 @@ CamelCatalogCondition describes the state of a resource at a certain point. Type of CamelCatalog condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -1812,7 +1817,7 @@ Endpoint represents a source/sink external entity (could be any Kubernetes resou |Description |`ref` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]* | @@ -2124,7 +2129,7 @@ string a short text specifying the reason |`time` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -2169,7 +2174,7 @@ int maximum number of attempts |`attemptTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | *(Optional)* @@ -2438,28 +2443,28 @@ IntegrationCondition describes the state of a resource at a certain point. Type of integration condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | Last time the condition transitioned from one status to another. |`firstTruthyTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -2521,21 +2526,21 @@ IntegrationKitCondition describes the state of a resource at a certain point. Type of integration condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -2626,6 +2631,7 @@ traits that the kit will execute Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -2814,6 +2820,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 (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. |`addons` + @@ -2913,15 +2920,16 @@ It can be useful if you want to provide some custom base image with further util the image registry used to push/pull Integration images |`buildCatalogToolTimeout` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#duration-v1-meta[Kubernetes meta/v1.Duration]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#duration-v1-meta[Kubernetes meta/v1.Duration]* | -the timeout (in seconds) to use when creating the build tools container image +the timeout (in seconds) to use when creating the build tools container image. + Deprecated: no longer in use |`timeout` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#duration-v1-meta[Kubernetes meta/v1.Duration]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#duration-v1-meta[Kubernetes meta/v1.Duration]* | @@ -2983,21 +2991,21 @@ IntegrationPlatformCondition describes the state of a resource at a certain poin Type of integration condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -3038,6 +3046,7 @@ IntegrationPlatformConditionType defines the type of condition. * <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>> IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform. + Deprecated: to be removed in future versions. [cols="2,2a",options="header"] @@ -3115,6 +3124,7 @@ list of traits to be executed for all the Integration/IntegrationKits built from Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -3235,7 +3245,7 @@ It can be useful if you want to provide some custom base image with further util the image registry used to push/pull Integration images |`timeout` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#duration-v1-meta[Kubernetes meta/v1.Duration]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#duration-v1-meta[Kubernetes meta/v1.Duration]* | @@ -3273,21 +3283,21 @@ IntegrationProfileCondition describes the state of a resource at a certain point Type of integration condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -3483,7 +3493,7 @@ the configuration of the project to build on Git a source in YAML DSL language which contain the routes to run |`integrationKit` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]* | @@ -3515,9 +3525,9 @@ the traits needed to run this Integration | -Pod template customization -Deprecated: -Use container, init-containers or owner traits instead +Pod template customization. + +Deprecated: use container, init-containers or owner traits instead |`configuration` + *xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]* @@ -3525,6 +3535,7 @@ Use container, init-containers or owner traits instead Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -3618,7 +3629,7 @@ the profile needed to run this Integration the traits executed for the Integration |`integrationKit` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]* | @@ -3664,8 +3675,9 @@ the catalog used to build/operate the Integration. | -Deprecated: -a list of configuration specification +a list of configuration specification. + +Deprecated: use properties instead. |`conditions` + *xref:#_camel_apache_org_v1_IntegrationCondition[[\]IntegrationCondition]* @@ -3703,14 +3715,14 @@ label selector features offered by the Integration |`lastInitTimestamp` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | the timestamp representing the last time when this integration was initialized. |`lastDeploymentTimestamp` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -4100,21 +4112,21 @@ KameletCondition describes the state of a resource at a certain point. Type of kamelet condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -4359,6 +4371,7 @@ Properties -- * <<#_camel_apache_org_v1_Task, Task>> KanikoTask is used to configure Kaniko. + Deprecated: no longer in use. [cols="2,2a",options="header"] @@ -4412,6 +4425,7 @@ docker image to use * <<#_camel_apache_org_v1_KanikoTask, KanikoTask>> KanikoTaskCache is used to configure Kaniko cache. + Deprecated: no longer in use. [cols="2,2a",options="header"] @@ -4595,7 +4609,7 @@ A reference to the ConfigMap or Secret key that contains the security of the Maven settings. |`caSecrets` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#secretkeyselector-v1-core[[\]Kubernetes core/v1.SecretKeySelector]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#secretkeyselector-v1-core[[\]Kubernetes core/v1.SecretKeySelector]* | @@ -4717,21 +4731,21 @@ PipeCondition describes the state of a resource at a certain point. Type of pipe condition. |`status` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]* | Status of the condition, one of True, False, Unknown. |`lastUpdateTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | The last time this condition was updated. |`lastTransitionTime` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#time-v1-meta[Kubernetes meta/v1.Time]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#time-v1-meta[Kubernetes meta/v1.Time]* | @@ -5070,7 +5084,7 @@ string |`condition` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#podcondition-v1-core[Kubernetes core/v1.PodCondition]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#podcondition-v1-core[Kubernetes core/v1.PodCondition]* | @@ -5108,35 +5122,35 @@ bool AutomountServiceAccountToken |`volumes` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#volume-v1-core[[\]Kubernetes core/v1.Volume]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#volume-v1-core[[\]Kubernetes core/v1.Volume]* | Volumes |`initContainers` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#container-v1-core[[\]Kubernetes core/v1.Container]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#container-v1-core[[\]Kubernetes core/v1.Container]* | InitContainers |`containers` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#container-v1-core[[\]Kubernetes core/v1.Container]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#container-v1-core[[\]Kubernetes core/v1.Container]* | Containers |`ephemeralContainers` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#ephemeralcontainer-v1-core[[\]Kubernetes core/v1.EphemeralContainer]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#ephemeralcontainer-v1-core[[\]Kubernetes core/v1.EphemeralContainer]* | EphemeralContainers |`restartPolicy` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#restartpolicy-v1-core[Kubernetes core/v1.RestartPolicy]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#restartpolicy-v1-core[Kubernetes core/v1.RestartPolicy]* | @@ -5157,7 +5171,7 @@ int64 ActiveDeadlineSeconds |`dnsPolicy` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#dnspolicy-v1-core[Kubernetes core/v1.DNSPolicy]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#dnspolicy-v1-core[Kubernetes core/v1.DNSPolicy]* | @@ -5171,14 +5185,14 @@ map[string]string NodeSelector |`topologySpreadConstraints` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#topologyspreadconstraint-v1-core[[\]Kubernetes core/v1.TopologySpreadConstraint]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#topologyspreadconstraint-v1-core[[\]Kubernetes core/v1.TopologySpreadConstraint]* | TopologySpreadConstraints |`securityContext` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#podsecuritycontext-v1-core[Kubernetes core/v1.PodSecurityContext]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#podsecuritycontext-v1-core[Kubernetes core/v1.PodSecurityContext]* | @@ -5656,7 +5670,8 @@ interpret this source at runtime Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader -uses to pre/post process sources +uses to pre/post process sources. + Deprecated: no longer in use. |`type` + @@ -5701,6 +5716,7 @@ SourceType represents an available source type. * <<#_camel_apache_org_v1_Task, Task>> SpectrumTask is used to configure Spectrum. + Deprecated: no longer in use. [cols="2,2a",options="header"] @@ -5793,7 +5809,8 @@ a PackageTask, used to package the project | -a BuildahTask, for Buildah strategy +a BuildahTask, for Buildah strategy. + Deprecated: use jib or a custom publishing strategy instead |`kaniko` + @@ -5801,7 +5818,8 @@ Deprecated: use jib or a custom publishing strategy instead | -a KanikoTask, for Kaniko strategy +a KanikoTask, for Kaniko strategy. + Deprecated: use jib or a custom publishing strategy instead |`spectrum` + @@ -5809,7 +5827,8 @@ Deprecated: use jib or a custom publishing strategy instead | -a SpectrumTask, for Spectrum strategy +a SpectrumTask, for Spectrum strategy. + Deprecated: use jib or a custom publishing strategy instead |`s2i` + @@ -5817,7 +5836,8 @@ Deprecated: use jib or a custom publishing strategy instead | -a S2iTask, for S2I strategy +a S2iTask, for S2I strategy. + Deprecated: use jib or a custom publishing strategy instead |`jib` + @@ -5861,8 +5881,9 @@ an unstructured raw message * <<#_camel_apache_org_v1_TraitSpec, TraitSpec>> -TraitConfiguration represents the expected configuration for a given trait parameter -Deprecated: superceded by each Trait type, left for backward compatibility. +TraitConfiguration represents the expected configuration for a given trait parameter. + +Deprecated: superseded by each Trait type, left for backward compatibility. [cols="2,2a",options="header"] |=== @@ -5899,8 +5920,9 @@ TraitProfile represents lists of traits that are enabled for the specific instal * <<#_camel_apache_org_v1_Traits, Traits>> -A TraitSpec contains the configuration of a trait -Deprecated: superceded by each Trait type, left for backward compatibility. +A TraitSpec contains the configuration of a trait. + +Deprecated: superseded by each Trait type, left for backward compatibility. [cols="2,2a",options="header"] |=== @@ -6003,7 +6025,8 @@ The configuration of Environment trait | -The configuration of Error Handler trait +The configuration of Error Handler trait. + Deprecated: no longer in use. |`gc` + @@ -6053,7 +6076,8 @@ The configuration of Istio trait | -The configuration of Jolokia trait +The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. |`jvm` + @@ -6117,7 +6141,8 @@ The configuration of Mount trait | -The configuration of OpenAPI trait +The configuration of OpenAPI trait. + Deprecated: no longer in use. |`owner` + @@ -6146,7 +6171,8 @@ The configuration of Platform trait | -The configuration of Pod trait +The configuration of Pod trait. + Deprecated: use init-containers instead. |`prometheus` + @@ -6176,6 +6202,7 @@ The configuration of Quarkus trait The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. |`route` + @@ -6183,7 +6210,8 @@ Deprecated: use jvm trait or read documentation. | -The configuration of Route trait +The configuration of Route trait. + Deprecated: use ingress instead. |`security-context` + @@ -6205,7 +6233,8 @@ The configuration of Service trait | -The configuration of Service Binding trait +The configuration of Service Binding trait. + Deprecated: no longer in use. |`telemetry` + @@ -6299,7 +6328,8 @@ string | -the command to execute +the command to execute. + Deprecated: use ContainerCommands |`commands` + @@ -6334,14 +6364,14 @@ ValueSource --. |Description |`configMapKeyRef` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#configmapkeyselector-v1-core[Kubernetes core/v1.ConfigMapKeySelector]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#configmapkeyselector-v1-core[Kubernetes core/v1.ConfigMapKeySelector]* | Selects a key of a ConfigMap. |`secretKeyRef` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#secretkeyselector-v1-core[Kubernetes core/v1.SecretKeySelector]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#secretkeyselector-v1-core[Kubernetes core/v1.SecretKeySelector]* | @@ -6445,7 +6475,8 @@ bool Enable verbose logging on build components that support it (e.g. Kaniko build pod). -Deprecated no longer in use + +Deprecated: no longer in use |`properties` + []string @@ -6489,6 +6520,7 @@ string When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. |`requestMemory` + @@ -6497,6 +6529,7 @@ string When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. |`limitCPU` + @@ -6505,6 +6538,7 @@ string When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. |`limitMemory` + @@ -6513,6 +6547,7 @@ string When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. |`mavenProfiles` + @@ -6650,7 +6685,8 @@ A list of properties to be provided to the Integration runtime * <<#_camel_apache_org_v1_trait_PlatformBaseTrait, PlatformBaseTrait>> * <<#_camel_apache_org_v1_trait_Trait, Trait>> -Configuration defines the trait structure +Configuration defines the trait structure. + Deprecated: for backward compatibility. [cols="2,2a",options="header"] @@ -6790,7 +6826,7 @@ won't be able to execute traits requiring CamelCatalog. If the container image y Integration `.spec.integrationKit` parameter. If you're moving the Integration across environments, you will also need to create an "external" IntegrationKit. |`imagePullPolicy` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#pullpolicy-v1-core[Kubernetes core/v1.PullPolicy]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#pullpolicy-v1-core[Kubernetes core/v1.PullPolicy]* | @@ -6811,7 +6847,7 @@ bool Security Context RunAsNonRoot configuration (default false). |`seccompProfileType` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#seccompprofiletype-v1-core[Kubernetes core/v1.SeccompProfileType]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#seccompprofiletype-v1-core[Kubernetes core/v1.SeccompProfileType]* | @@ -6825,14 +6861,14 @@ bool Security Context AllowPrivilegeEscalation configuration (default false). |`capabilitiesDrop` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#capability-v1-core[[\]Kubernetes core/v1.Capability]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#capability-v1-core[[\]Kubernetes core/v1.Capability]* | Security Context Capabilities Drop configuration (default ALL). |`capabilitiesAdd` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#capability-v1-core[[\]Kubernetes core/v1.Capability]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#capability-v1-core[[\]Kubernetes core/v1.Capability]* | @@ -7015,10 +7051,11 @@ string | -Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. +Deprecated: this feature will be removed in future releases. + |`useSSA` + bool | @@ -7061,7 +7098,7 @@ The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. |`strategy` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#deploymentstrategytype-v1-apps[Kubernetes apps/v1.DeploymentStrategyType]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#deploymentstrategytype-v1-apps[Kubernetes apps/v1.DeploymentStrategyType]* | @@ -7100,7 +7137,7 @@ Defaults to `25%`. * <<#_camel_apache_org_v1_trait_GCTrait, GCTrait>> - +DiscoveryCacheType --. [#_camel_apache_org_v1_trait_EnvironmentTrait] @@ -7215,6 +7252,7 @@ The GC Trait garbage-collects all resources that are no longer necessary upon in Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. @@ -7595,6 +7633,7 @@ string To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. |`paths` + @@ -7605,7 +7644,7 @@ Deprecated: In favor of `paths` - left for backward compatibility. To configure the paths exposed by the ingress (default `['/']`). |`pathType` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#pathtype-v1-networking[Kubernetes networking/v1.PathType]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#pathtype-v1-networking[Kubernetes networking/v1.PathType]* | @@ -7643,7 +7682,7 @@ To configure tls secret name * <<#_camel_apache_org_v1_Traits, Traits>> -The InitContainersTrait trait can be used to configure `init containers` or `sidecar containers`. +The Init Containers trait can be used to configure `init containers` or `sidecar containers`. [cols="2,2a",options="header"] @@ -7758,7 +7797,8 @@ bool | -Prints the command used the start the JVM in the container logs (default `true`) +Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. |`debugAddress` + @@ -8790,6 +8830,7 @@ Deprecated: no longer in use. Legacy trait configuration parameters. + Deprecated: for backward compatibility. @@ -8997,6 +9038,7 @@ QuarkusMode is the type of Quarkus build packaging. * <<#_camel_apache_org_v1_trait_QuarkusTrait, QuarkusTrait>> QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. @@ -9040,6 +9082,7 @@ with the native kit having precedence over the `fast-jar` one once ready. The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. |`buildMode` + @@ -9076,6 +9119,7 @@ The image containing the tooling required for a native build (by default it will * <<#_camel_apache_org_v1_trait_Configuration, Configuration>> RawMessage defines a binary type for configuration + Deprecated: for backward compatibility. @@ -9291,7 +9335,7 @@ bool Security Context RunAsNonRoot configuration (default false). |`seccompProfileType` + -*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#seccompprofiletype-v1-core[Kubernetes core/v1.SeccompProfileType]* +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#seccompprofiletype-v1-core[Kubernetes core/v1.SeccompProfileType]* | @@ -9374,6 +9418,7 @@ bool Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. |`type` + @@ -9598,6 +9643,7 @@ Can be used to enable or disable a trait. All traits share this common property. Legacy trait configuration parameters. + Deprecated: for backward compatibility. diff --git a/docs/modules/traits/pages/builder.adoc b/docs/modules/traits/pages/builder.adoc index c83da3ed77..9cb46d3fe6 100755 --- a/docs/modules/traits/pages/builder.adoc +++ b/docs/modules/traits/pages/builder.adoc @@ -33,7 +33,8 @@ The following configuration options are available: | builder.verbose | bool | Enable verbose logging on build components that support it (e.g. Kaniko build pod). -Deprecated no longer in use + +Deprecated: no longer in use | builder.properties | []string @@ -59,21 +60,25 @@ installed and ready to use on path (ie `/usr/bin/java`). | builder.request-cpu | string | When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. | builder.request-memory | string | When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. | builder.limit-cpu | string | When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. | builder.limit-memory | string | When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. | builder.maven-profiles diff --git a/docs/modules/traits/pages/deployer.adoc b/docs/modules/traits/pages/deployer.adoc index e3b03077aa..70b75e0a25 100644 --- a/docs/modules/traits/pages/deployer.adoc +++ b/docs/modules/traits/pages/deployer.adoc @@ -32,10 +32,11 @@ The following configuration options are available: | deployer.kind | string -| Deprecated: this feature will be removed in future releases. -Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` +| Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. +Deprecated: this feature will be removed in future releases. + | deployer.use-ssa | bool | Deprecated: no longer in use. diff --git a/docs/modules/traits/pages/ingress.adoc b/docs/modules/traits/pages/ingress.adoc index b6e85e202c..8da238ea6b 100755 --- a/docs/modules/traits/pages/ingress.adoc +++ b/docs/modules/traits/pages/ingress.adoc @@ -48,6 +48,7 @@ See https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx- | ingress.path | string | To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. | ingress.paths diff --git a/docs/modules/traits/pages/init-containers.adoc b/docs/modules/traits/pages/init-containers.adoc index 19d37b594c..5633136649 100644 --- a/docs/modules/traits/pages/init-containers.adoc +++ b/docs/modules/traits/pages/init-containers.adoc @@ -3,7 +3,7 @@ // Start of autogenerated code - DO NOT EDIT! (badges) // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) -The InitContainersTrait trait can be used to configure `init containers` or `sidecar containers`. +The Init Containers trait can be used to configure `init containers` or `sidecar containers`. This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/jvm.adoc b/docs/modules/traits/pages/jvm.adoc index 0b02a9024a..c3300594fa 100755 --- a/docs/modules/traits/pages/jvm.adoc +++ b/docs/modules/traits/pages/jvm.adoc @@ -39,7 +39,8 @@ The following configuration options are available: | jvm.print-command | bool -| Prints the command used the start the JVM in the container logs (default `true`) +| Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. | jvm.debug-address diff --git a/docs/modules/traits/pages/quarkus.adoc b/docs/modules/traits/pages/quarkus.adoc index 1521ed036d..29c0de3811 100755 --- a/docs/modules/traits/pages/quarkus.adoc +++ b/docs/modules/traits/pages/quarkus.adoc @@ -43,6 +43,7 @@ with the native kit having precedence over the `fast-jar` one once ready. The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. | quarkus.build-mode diff --git a/docs/modules/traits/pages/service.adoc b/docs/modules/traits/pages/service.adoc index 4ef95200d1..e1e265cfdc 100755 --- a/docs/modules/traits/pages/service.adoc +++ b/docs/modules/traits/pages/service.adoc @@ -39,6 +39,7 @@ The following configuration options are available: | service.node-port | bool | Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. | service.type diff --git a/e2e/support/util/dump.go b/e2e/support/util/dump.go index fa06dcdba3..39213b94e0 100644 --- a/e2e/support/util/dump.go +++ b/e2e/support/util/dump.go @@ -1,5 +1,4 @@ //go:build integration -// +build integration /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/e2e/support/util/log_counter.go b/e2e/support/util/log_counter.go index e1ae294d5e..a6e465044a 100644 --- a/e2e/support/util/log_counter.go +++ b/e2e/support/util/log_counter.go @@ -1,5 +1,4 @@ //go:build integration -// +build integration /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/e2e/support/util/log_scanner.go b/e2e/support/util/log_scanner.go index 7508bc4a2b..23829c9138 100644 --- a/e2e/support/util/log_scanner.go +++ b/e2e/support/util/log_scanner.go @@ -1,5 +1,4 @@ //go:build integration -// +build integration /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/e2e/support/util/log_walker.go b/e2e/support/util/log_walker.go index ee1dbed704..b56f3f103f 100644 --- a/e2e/support/util/log_walker.go +++ b/e2e/support/util/log_walker.go @@ -1,5 +1,4 @@ //go:build integration -// +build integration /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/e2e/support/util/structured_log.go b/e2e/support/util/structured_log.go index d95b4a8e5f..e8459e047f 100644 --- a/e2e/support/util/structured_log.go +++ b/e2e/support/util/structured_log.go @@ -26,7 +26,7 @@ import ( type LogEntry struct { // Zap Level zapcore.Level `json:"level,omitempty"` - Timestamp time.Time `json:"ts,omitempty"` + Timestamp time.Time `json:"ts"` LoggerName string `json:"logger,omitempty"` Message string `json:"msg,omitempty"` // Controller runtime diff --git a/e2e/support/util/temp_file.go b/e2e/support/util/temp_file.go index 3d255a9778..1d93285e90 100644 --- a/e2e/support/util/temp_file.go +++ b/e2e/support/util/temp_file.go @@ -1,5 +1,4 @@ //go:build integration -// +build integration /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/go.mod b/go.mod index 64d64fbd6b..7b36135b31 100644 --- a/go.mod +++ b/go.mod @@ -40,13 +40,13 @@ require ( golang.org/x/text v0.33.0 golang.org/x/time v0.14.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.34.3 - k8s.io/apimachinery v0.34.3 - k8s.io/cli-runtime v0.34.1 - k8s.io/client-go v0.34.3 - k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 + k8s.io/api v0.35.0 + k8s.io/apimachinery v0.35.0 + k8s.io/cli-runtime v0.35.0 + k8s.io/client-go v0.35.0 + k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b k8s.io/klog/v2 v2.130.1 - k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 + k8s.io/utils v0.0.0-20260108192941-914a6e750570 knative.dev/eventing v0.47.0 knative.dev/pkg v0.0.0-20251224022520-6fe064596819 knative.dev/serving v0.47.1 @@ -106,7 +106,6 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pjbgf/sha1cd v0.3.2 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/procfs v0.17.0 // indirect github.com/rickb777/date v1.13.0 // indirect @@ -135,12 +134,12 @@ require ( golang.org/x/tools v0.40.0 // indirect gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect google.golang.org/protobuf v1.36.11 // indirect - gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect + gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.34.3 // indirect - k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect + k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect knative.dev/networking v0.0.0-20251030154838-4115314567bb // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/randfill v1.0.0 // indirect diff --git a/go.sum b/go.sum index 39e411d43f..2ed982c432 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw= -github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= +github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns= +github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q= @@ -428,8 +428,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= -gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= +gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo= +gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -445,27 +445,27 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.34.3 h1:D12sTP257/jSH2vHV2EDYrb16bS7ULlHpdNdNhEw2S4= -k8s.io/api v0.34.3/go.mod h1:PyVQBF886Q5RSQZOim7DybQjAbVs8g7gwJNhGtY5MBk= +k8s.io/api v0.35.0 h1:iBAU5LTyBI9vw3L5glmat1njFK34srdLmktWwLTprlY= +k8s.io/api v0.35.0/go.mod h1:AQ0SNTzm4ZAczM03QH42c7l3bih1TbAXYo0DkF8ktnA= k8s.io/apiextensions-apiserver v0.34.3 h1:p10fGlkDY09eWKOTeUSioxwLukJnm+KuDZdrW71y40g= k8s.io/apiextensions-apiserver v0.34.3/go.mod h1:aujxvqGFRdb/cmXYfcRTeppN7S2XV/t7WMEc64zB5A0= -k8s.io/apimachinery v0.34.3 h1:/TB+SFEiQvN9HPldtlWOTp0hWbJ+fjU+wkxysf/aQnE= -k8s.io/apimachinery v0.34.3/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +k8s.io/apimachinery v0.35.0 h1:Z2L3IHvPVv/MJ7xRxHEtk6GoJElaAqDCCU0S6ncYok8= +k8s.io/apimachinery v0.35.0/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns= k8s.io/apiserver v0.34.3 h1:uGH1qpDvSiYG4HVFqc6A3L4CKiX+aBWDrrsxHYK0Bdo= k8s.io/apiserver v0.34.3/go.mod h1:QPnnahMO5C2m3lm6fPW3+JmyQbvHZQ8uudAu/493P2w= -k8s.io/cli-runtime v0.34.1 h1:btlgAgTrYd4sk8vJTRG6zVtqBKt9ZMDeQZo2PIzbL7M= -k8s.io/cli-runtime v0.34.1/go.mod h1:aVA65c+f0MZiMUPbseU/M9l1Wo2byeaGwUuQEQVVveE= -k8s.io/client-go v0.34.3 h1:wtYtpzy/OPNYf7WyNBTj3iUA0XaBHVqhv4Iv3tbrF5A= -k8s.io/client-go v0.34.3/go.mod h1:OxxeYagaP9Kdf78UrKLa3YZixMCfP6bgPwPwNBQBzpM= -k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 h1:wBIDZID8ju9pwOiLlV22YYKjFGtiNSWgHf5CnKLRUuM= -k8s.io/gengo v0.0.0-20240404160639-a0386bf69313/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/cli-runtime v0.35.0 h1:PEJtYS/Zr4p20PfZSLCbY6YvaoLrfByd6THQzPworUE= +k8s.io/cli-runtime v0.35.0/go.mod h1:VBRvHzosVAoVdP3XwUQn1Oqkvaa8facnokNkD7jOTMY= +k8s.io/client-go v0.35.0 h1:IAW0ifFbfQQwQmga0UdoH0yvdqrbwMdq9vIFEhRpxBE= +k8s.io/client-go v0.35.0/go.mod h1:q2E5AAyqcbeLGPdoRB+Nxe3KYTfPce1Dnu1myQdqz9o= +k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b h1:X0Afwan8Q1l7bMcNgh6DAah2jKCQ2irT7EoAXIChFqk= +k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA= -k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts= -k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= -k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE= +k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= +k8s.io/utils v0.0.0-20260108192941-914a6e750570 h1:JT4W8lsdrGENg9W+YwwdLJxklIuKWdRm+BC+xt33FOY= +k8s.io/utils v0.0.0-20260108192941-914a6e750570/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= knative.dev/eventing v0.47.0 h1:FfM1aS7iBn9o0v7xqIBEWcR4XZ8Ny7YyFPAOyLEgMok= knative.dev/eventing v0.47.0/go.mod h1:TiRvRwoU0GIqAFoI4YoHnm08ZRCr7eiPeNxUXZoRO2M= knative.dev/networking v0.0.0-20251030154838-4115314567bb h1:rTU7/2UoqfhAA9XR9lqMQ7dalASYhKt4cz6J1yggEj8= diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index 84cb8ad48e..301bbb9c0f 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: builds.camel.apache.org @@ -87,6 +87,7 @@ spec: configuration: description: |- The configuration that should be used to perform the Build. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility properties: annotations: @@ -146,13 +147,15 @@ spec: type: object maxRunningBuilds: description: |- - the maximum amount of parallel running builds started by this operator instance + the maximum amount of parallel running builds started by this operator instance. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility format: int32 type: integer operatorNamespace: description: |- The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation). + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility type: string tasks: @@ -163,7 +166,8 @@ spec: properties: buildah: description: |- - a BuildahTask, for Buildah strategy + a BuildahTask, for Buildah strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -845,7 +849,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -893,7 +898,8 @@ spec: properties: command: description: |- - the command to execute + the command to execute. + Deprecated: use ContainerCommands type: string commands: @@ -1076,7 +1082,8 @@ spec: type: object kaniko: description: |- - a KanikoTask, for Kaniko strategy + a KanikoTask, for Kaniko strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -1767,7 +1774,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -1811,7 +1819,8 @@ spec: type: object s2i: description: |- - a S2iTask, for S2I strategy + a S2iTask, for S2I strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -1914,7 +1923,8 @@ spec: type: object spectrum: description: |- - a SpectrumTask, for Spectrum strategy + a SpectrumTask, for Spectrum strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -2025,6 +2035,7 @@ spec: toolImage: description: |- The container image to be used to run the build. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility type: string type: object @@ -2164,7 +2175,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: camelcatalogs.camel.apache.org @@ -2693,7 +2704,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: integrationkits.camel.apache.org @@ -2773,6 +2784,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -2838,7 +2850,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -2903,6 +2916,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2916,11 +2930,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -2961,11 +2977,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -3014,7 +3032,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -3023,6 +3042,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3070,6 +3090,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3093,10 +3114,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -3107,11 +3130,13 @@ spec: registry: description: |- 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: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3267,7 +3292,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: integrationplatforms.camel.apache.org @@ -3354,7 +3379,8 @@ spec: type: string buildCatalogToolTimeout: description: |- - the timeout (in seconds) to use when creating the build tools container image + the timeout (in seconds) to use when creating the build tools container image. + Deprecated: no longer in use type: string buildConfiguration: @@ -3713,6 +3739,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -3784,6 +3811,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3838,6 +3866,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3851,11 +3880,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -3896,11 +3927,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -3949,7 +3982,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -3958,6 +3992,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4011,6 +4046,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4144,6 +4180,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4177,6 +4214,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4190,6 +4228,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4198,9 +4237,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -4216,6 +4256,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4265,6 +4306,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4291,12 +4333,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4314,12 +4358,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -4357,6 +4403,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4402,6 +4449,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4548,6 +4596,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4566,6 +4615,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -4598,6 +4648,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4629,6 +4680,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4644,7 +4696,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -4664,6 +4717,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4743,6 +4797,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4773,7 +4828,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -4787,6 +4843,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4822,6 +4879,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4914,6 +4972,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5023,6 +5082,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5077,6 +5137,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5112,6 +5173,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5158,6 +5220,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5201,7 +5264,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -5213,6 +5277,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5226,6 +5291,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5250,6 +5316,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5279,6 +5346,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5294,12 +5362,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5314,6 +5384,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5342,6 +5413,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5379,6 +5451,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5402,10 +5475,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -5416,11 +5491,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5431,7 +5508,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -5446,6 +5524,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5535,6 +5614,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5574,6 +5654,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5589,6 +5670,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -5612,12 +5694,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5651,6 +5735,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5684,6 +5769,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -5727,7 +5813,8 @@ spec: type: string buildCatalogToolTimeout: description: |- - the timeout (in seconds) to use when creating the build tools container image + the timeout (in seconds) to use when creating the build tools container image. + Deprecated: no longer in use type: string buildConfiguration: @@ -6120,6 +6207,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -6205,6 +6293,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6259,6 +6348,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6272,11 +6362,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -6317,11 +6409,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -6370,7 +6464,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -6379,6 +6474,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6432,6 +6528,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6565,6 +6662,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6598,6 +6696,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6611,6 +6710,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6619,9 +6719,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -6637,6 +6738,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6686,6 +6788,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6712,12 +6815,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6735,12 +6840,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -6778,6 +6885,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6823,6 +6931,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6969,6 +7078,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -6987,6 +7097,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -7019,6 +7130,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7050,6 +7162,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7065,7 +7178,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -7085,6 +7199,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7164,6 +7279,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7194,7 +7310,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -7208,6 +7325,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7243,6 +7361,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7335,6 +7454,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7444,6 +7564,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7498,6 +7619,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7533,6 +7655,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7579,6 +7702,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7622,7 +7746,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -7634,6 +7759,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7647,6 +7773,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7671,6 +7798,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7700,6 +7828,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7715,12 +7844,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7735,6 +7866,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7763,6 +7895,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7800,6 +7933,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7823,10 +7957,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -7837,11 +7973,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7852,7 +7990,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -7867,6 +8006,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7956,6 +8096,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7995,6 +8136,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8010,6 +8152,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -8033,12 +8176,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8072,6 +8217,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8105,6 +8251,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8143,7 +8290,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: integrationprofiles.camel.apache.org @@ -8528,6 +8675,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8582,6 +8730,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8595,11 +8744,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -8640,11 +8791,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -8693,7 +8846,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -8702,6 +8856,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8755,6 +8910,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8888,6 +9044,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8921,6 +9078,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8934,6 +9092,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8942,9 +9101,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -8960,6 +9120,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9009,6 +9170,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9035,12 +9197,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9058,12 +9222,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -9101,6 +9267,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9146,6 +9313,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9292,6 +9460,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9310,6 +9479,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -9342,6 +9512,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9373,6 +9544,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9388,7 +9560,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -9408,6 +9581,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9487,6 +9661,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9517,7 +9692,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -9531,6 +9707,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9566,6 +9743,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9658,6 +9836,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9767,6 +9946,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9821,6 +10001,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9856,6 +10037,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9902,6 +10084,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9945,7 +10128,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -9957,6 +10141,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9970,6 +10155,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9994,6 +10180,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10023,6 +10210,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10038,12 +10226,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10058,6 +10248,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10086,6 +10277,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10123,6 +10315,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10146,10 +10339,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -10160,11 +10355,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10175,7 +10372,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -10190,6 +10388,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10279,6 +10478,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10318,6 +10518,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10333,6 +10534,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -10356,12 +10558,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10395,6 +10599,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10428,6 +10633,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10828,6 +11034,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10882,6 +11089,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10895,11 +11103,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -10940,11 +11150,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -10993,7 +11205,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -11002,6 +11215,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11055,6 +11269,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11188,6 +11403,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11221,6 +11437,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11234,6 +11451,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11242,9 +11460,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -11260,6 +11479,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11309,6 +11529,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11335,12 +11556,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11358,12 +11581,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -11401,6 +11626,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11446,6 +11672,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11592,6 +11819,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11610,6 +11838,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -11642,6 +11871,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11673,6 +11903,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11688,7 +11919,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -11708,6 +11940,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11787,6 +12020,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11817,7 +12051,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -11831,6 +12066,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11866,6 +12102,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11958,6 +12195,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12067,6 +12305,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12121,6 +12360,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12156,6 +12396,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12202,6 +12443,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12245,7 +12487,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -12257,6 +12500,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12270,6 +12514,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12294,6 +12539,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12323,6 +12569,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12338,12 +12585,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12358,6 +12607,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12386,6 +12636,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12423,6 +12674,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12446,10 +12698,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -12460,11 +12714,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12475,7 +12731,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -12490,6 +12747,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12579,6 +12837,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12618,6 +12877,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12633,6 +12893,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -12656,12 +12917,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12695,6 +12958,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12728,6 +12992,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -12763,7 +13028,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: integrations.camel.apache.org @@ -12838,6 +13103,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -12980,7 +13246,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -13018,9 +13285,9 @@ spec: type: array template: description: |- - Pod template customization - Deprecated: - Use container, init-containers or owner traits instead + Pod template customization. + + Deprecated: use container, init-containers or owner traits instead properties: spec: description: the specification @@ -13912,7 +14179,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -16955,7 +17224,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -18623,7 +18894,7 @@ spec: resources: description: |- resources represents the minimum resources the volume should have. - If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements + Users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources @@ -19509,6 +19780,24 @@ spec: description: Kubelet's generated CSRs will be addressed to this signer. type: string + userAnnotations: + additionalProperties: + type: string + description: |- + userAnnotations allow pod authors to pass additional information to + the signer implementation. Kubernetes does not restrict or validate this + metadata in any way. + + These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of + the PodCertificateRequest objects that Kubelet creates. + + Entries are subject to the same validation as object metadata annotations, + with the addition that all keys must be domain-prefixed. No restrictions + are placed on values, except an overall size limitation on the entire field. + + Signers should document the keys and values they support. Signers should + deny requests that contain keys they do not recognize. + type: object required: - keyType - signerName @@ -19962,6 +20251,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20016,6 +20306,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20029,11 +20320,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -20074,11 +20367,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -20127,7 +20422,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -20136,6 +20432,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20189,6 +20486,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20322,6 +20620,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20355,6 +20654,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20368,6 +20668,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20376,9 +20677,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -20394,6 +20696,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20443,6 +20746,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20469,12 +20773,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20492,12 +20798,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -20535,6 +20843,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20580,6 +20889,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20726,6 +21036,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20744,6 +21055,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -20776,6 +21088,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20807,6 +21120,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20822,7 +21136,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -20842,6 +21157,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20921,6 +21237,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -20951,7 +21268,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -20965,6 +21283,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21000,6 +21319,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21092,6 +21412,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21201,6 +21522,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21255,6 +21577,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21290,6 +21613,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21336,6 +21660,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21379,7 +21704,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -21391,6 +21717,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21404,6 +21731,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21428,6 +21756,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21457,6 +21786,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21472,12 +21802,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21492,6 +21824,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21520,6 +21853,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21557,6 +21891,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21580,10 +21915,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -21594,11 +21931,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21609,7 +21948,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -21624,6 +21964,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21713,6 +22054,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21752,6 +22094,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21767,6 +22110,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -21790,12 +22134,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21829,6 +22175,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21862,6 +22209,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -21953,7 +22301,7 @@ spec: observedGeneration: description: |- If set, this represents the .metadata.generation that the pod condition was set based upon. - This is an alpha field. Enable PodObservedGenerationTracking to be able to use this field. + The PodObservedGenerationTracking feature gate must be enabled to use this field. format: int64 type: integer reason: @@ -22012,8 +22360,9 @@ spec: type: array configuration: description: |- - Deprecated: - a list of configuration specification + a list of configuration specification. + + Deprecated: use properties instead. items: description: ConfigurationSpec represents a generic configuration specification. @@ -22066,7 +22415,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -22216,6 +22566,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22270,6 +22621,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22283,11 +22635,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -22328,11 +22682,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -22381,7 +22737,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -22390,6 +22747,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22443,6 +22801,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22576,6 +22935,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22609,6 +22969,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22622,6 +22983,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22630,9 +22992,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -22648,6 +23011,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22697,6 +23061,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22723,12 +23088,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22746,12 +23113,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -22789,6 +23158,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22834,6 +23204,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22980,6 +23351,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -22998,6 +23370,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -23030,6 +23403,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23061,6 +23435,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23076,7 +23451,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -23096,6 +23472,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23175,6 +23552,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23205,7 +23583,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -23219,6 +23598,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23254,6 +23634,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23346,6 +23727,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23455,6 +23837,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23509,6 +23892,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23544,6 +23928,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23590,6 +23975,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23633,7 +24019,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -23645,6 +24032,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23658,6 +24046,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23682,6 +24071,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23711,6 +24101,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23726,12 +24117,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23746,6 +24139,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23774,6 +24168,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23811,6 +24206,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23834,10 +24230,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -23848,11 +24246,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23863,7 +24263,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -23878,6 +24279,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -23967,6 +24369,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -24006,6 +24409,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -24021,6 +24425,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -24044,12 +24449,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -24083,6 +24490,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -24116,6 +24524,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -24158,7 +24567,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: kamelets.camel.apache.org @@ -24601,7 +25010,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -25182,7 +25592,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -25457,7 +25868,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 labels: app: camel-k name: pipes.camel.apache.org @@ -25528,6 +25939,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -25670,7 +26082,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -25708,9 +26121,9 @@ spec: type: array template: description: |- - Pod template customization - Deprecated: - Use container, init-containers or owner traits instead + Pod template customization. + + Deprecated: use container, init-containers or owner traits instead properties: spec: description: the specification @@ -26611,7 +27024,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -29680,7 +30095,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -31354,7 +31771,7 @@ spec: resources: description: |- resources represents the minimum resources the volume should have. - If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements + Users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources @@ -32251,6 +32668,24 @@ spec: description: Kubelet's generated CSRs will be addressed to this signer. type: string + userAnnotations: + additionalProperties: + type: string + description: |- + userAnnotations allow pod authors to pass additional information to + the signer implementation. Kubernetes does not restrict or validate this + metadata in any way. + + These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of + the PodCertificateRequest objects that Kubelet creates. + + Entries are subject to the same validation as object metadata annotations, + with the addition that all keys must be domain-prefixed. No restrictions + are placed on values, except an overall size limitation on the entire field. + + Signers should document the keys and values they support. Signers should + deny requests that contain keys they do not recognize. + type: object required: - keyType - signerName @@ -32708,6 +33143,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -32762,6 +33198,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -32775,11 +33212,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -32821,11 +33260,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -32874,7 +33315,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -32883,6 +33325,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -32938,6 +33381,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33071,6 +33515,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33104,6 +33549,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33117,6 +33563,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33125,9 +33572,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -33143,6 +33591,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33192,6 +33641,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33218,12 +33668,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33241,12 +33693,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -33284,6 +33738,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33329,6 +33784,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33475,6 +33931,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33493,6 +33950,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -33525,6 +33983,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33557,6 +34016,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33572,7 +34032,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -33592,6 +34053,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33671,6 +34133,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33701,7 +34164,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -33715,6 +34179,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33750,6 +34215,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33843,6 +34309,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -33952,6 +34419,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34006,6 +34474,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34041,6 +34510,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34088,6 +34558,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34131,7 +34602,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -34143,6 +34615,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34156,6 +34629,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34180,6 +34654,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34209,6 +34684,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34224,12 +34700,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34244,6 +34722,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34272,6 +34751,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34310,6 +34790,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34333,10 +34814,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -34347,11 +34830,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34362,7 +34847,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -34377,6 +34863,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34466,6 +34953,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34505,6 +34993,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34520,6 +35009,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -34543,12 +35033,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34582,6 +35074,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34616,6 +35109,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34898,6 +35392,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34952,6 +35447,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -34965,11 +35461,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -35010,11 +35508,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -35063,7 +35563,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -35072,6 +35573,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35125,6 +35627,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35258,6 +35761,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35291,6 +35795,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35304,6 +35809,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35312,9 +35818,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -35330,6 +35837,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35379,6 +35887,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35405,12 +35914,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35428,12 +35939,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -35471,6 +35984,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35516,6 +36030,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35662,6 +36177,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35680,6 +36196,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -35712,6 +36229,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35743,6 +36261,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35758,7 +36277,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -35778,6 +36298,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35857,6 +36378,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35887,7 +36409,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -35901,6 +36424,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -35936,6 +36460,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36028,6 +36553,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36137,6 +36663,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36191,6 +36718,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36226,6 +36754,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36272,6 +36801,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36315,7 +36845,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -36327,6 +36858,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36340,6 +36872,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36364,6 +36897,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36393,6 +36927,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36408,12 +36943,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36428,6 +36965,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36456,6 +36994,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36493,6 +37032,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36516,10 +37056,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -36530,11 +37072,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36545,7 +37089,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -36560,6 +37105,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36649,6 +37195,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36688,6 +37235,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36703,6 +37251,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -36726,12 +37275,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36765,6 +37316,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36798,6 +37350,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -36870,7 +37423,7 @@ spec: observedGeneration: description: |- If set, this represents the .metadata.generation that the pod condition was set based upon. - This is an alpha field. Enable PodObservedGenerationTracking to be able to use this field. + The PodObservedGenerationTracking feature gate must be enabled to use this field. format: int64 type: integer reason: diff --git a/pkg/apis/camel/v1/build_types.go b/pkg/apis/camel/v1/build_types.go index 89ab7d01dc..25da40e3dc 100644 --- a/pkg/apis/camel/v1/build_types.go +++ b/pkg/apis/camel/v1/build_types.go @@ -31,12 +31,15 @@ type BuildSpec struct { // The sequence of tasks (pipeline) to be performed. Tasks []Task `json:"tasks,omitempty"` // The configuration that should be used to perform the Build. + // // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility Configuration BuildConfiguration `json:"configuration,omitempty"` // The container image to be used to run the build. + // // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility ToolImage string `json:"toolImage,omitempty"` // The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation). + // // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility BuilderPodNamespace string `json:"operatorNamespace,omitempty"` // Timeout defines the Build maximum execution duration. @@ -45,7 +48,8 @@ type BuildSpec struct { // and its phase set to BuildPhaseFailed. // +kubebuilder:validation:Format=duration Timeout metav1.Duration `json:"timeout,omitempty"` - // the maximum amount of parallel running builds started by this operator instance + // the maximum amount of parallel running builds started by this operator instance. + // // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility MaxRunningBuilds int32 `json:"maxRunningBuilds,omitempty"` } @@ -66,16 +70,20 @@ type Task struct { // Application Publishing - // a BuildahTask, for Buildah strategy + // a BuildahTask, for Buildah strategy. + // // Deprecated: use jib or a custom publishing strategy instead Buildah *BuildahTask `json:"buildah,omitempty"` - // a KanikoTask, for Kaniko strategy + // a KanikoTask, for Kaniko strategy. + // // Deprecated: use jib or a custom publishing strategy instead Kaniko *KanikoTask `json:"kaniko,omitempty"` - // a SpectrumTask, for Spectrum strategy + // a SpectrumTask, for Spectrum strategy. + // // Deprecated: use jib or a custom publishing strategy instead Spectrum *SpectrumTask `json:"spectrum,omitempty"` - // a S2iTask, for S2I strategy + // a S2iTask, for S2I strategy. + // // Deprecated: use jib or a custom publishing strategy instead S2i *S2iTask `json:"s2i,omitempty"` // a JibTask, for Jib strategy @@ -150,6 +158,7 @@ type PublishTask struct { } // BuildahTask is used to configure Buildah. +// // Deprecated: no longer in use. type BuildahTask struct { BaseTask `json:",inline"` @@ -164,6 +173,7 @@ type BuildahTask struct { } // KanikoTask is used to configure Kaniko. +// // Deprecated: no longer in use. type KanikoTask struct { BaseTask `json:",inline"` @@ -178,6 +188,7 @@ type KanikoTask struct { } // KanikoTaskCache is used to configure Kaniko cache. +// // Deprecated: no longer in use. type KanikoTaskCache struct { // true if a cache is enabled @@ -193,6 +204,7 @@ type JibTask struct { } // SpectrumTask is used to configure Spectrum. +// // Deprecated: no longer in use. type SpectrumTask struct { BaseTask `json:",inline"` @@ -216,7 +228,8 @@ type UserTask struct { ContainerImage string `json:"image,omitempty"` // the user id used to run the container ContainerUserID *int64 `json:"userId,omitempty"` - // the command to execute + // the command to execute. + // // Deprecated: use ContainerCommands ContainerCommand string `json:"command,omitempty"` // the command to execute diff --git a/pkg/apis/camel/v1/camelcatalog_types_support.go b/pkg/apis/camel/v1/camelcatalog_types_support.go index bfe6432bfc..f7d50b2f7e 100644 --- a/pkg/apis/camel/v1/camelcatalog_types_support.go +++ b/pkg/apis/camel/v1/camelcatalog_types_support.go @@ -184,7 +184,7 @@ func (c *CamelCatalogSpec) GetRuntimeVersion() string { return c.Runtime.Version } -// GetRuntimeVersion returns the Camel K runtime version of the catalog. +// GetRuntimeProvider returns the Camel K runtime provider of the catalog. func (c *CamelCatalogSpec) GetRuntimeProvider() RuntimeProvider { return c.Runtime.Provider } diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go index 335435860c..8bc6a73ba1 100644 --- a/pkg/apis/camel/v1/common_types.go +++ b/pkg/apis/camel/v1/common_types.go @@ -25,6 +25,7 @@ import ( const ( // TraitAnnotationPrefix represents the prefix used for traits annotations. + // // Deprecated: use .spec.traits instead. TraitAnnotationPrefix = "trait.camel.apache.org/" // OperatorIDAnnotation operator id annotation label. @@ -203,7 +204,8 @@ type Traits struct { Deployment *trait.DeploymentTrait `json:"deployment,omitempty" property:"deployment"` // The configuration of Environment trait Environment *trait.EnvironmentTrait `json:"environment,omitempty" property:"environment"` - // The configuration of Error Handler trait + // The configuration of Error Handler trait. + // // Deprecated: no longer in use. ErrorHandler *trait.ErrorHandlerTrait `json:"error-handler,omitempty" property:"error-handler"` // The configuration of GC trait @@ -218,7 +220,8 @@ type Traits struct { InitContainers *trait.InitContainersTrait `json:"init-containers,omitempty" property:"init-containers"` // The configuration of Istio trait Istio *trait.IstioTrait `json:"istio,omitempty" property:"istio"` - // The configuration of Jolokia trait + // The configuration of Jolokia trait. + // // Deprecated: use jvm.agent instead. Jolokia *trait.JolokiaTrait `json:"jolokia,omitempty" property:"jolokia"` // The configuration of JVM trait @@ -237,7 +240,8 @@ type Traits struct { Master *trait.MasterTrait `json:"master,omitempty" property:"master"` // The configuration of Mount trait Mount *trait.MountTrait `json:"mount,omitempty" property:"mount"` - // The configuration of OpenAPI trait + // The configuration of OpenAPI trait. + // // Deprecated: no longer in use. OpenAPI *trait.OpenAPITrait `json:"openapi,omitempty" property:"openapi"` // The configuration of Owner trait @@ -246,7 +250,8 @@ type Traits struct { PDB *trait.PDBTrait `json:"pdb,omitempty" property:"pdb"` // The configuration of Platform trait Platform *trait.PlatformTrait `json:"platform,omitempty" property:"platform"` - // The configuration of Pod trait + // The configuration of Pod trait. + // // Deprecated: use init-containers instead. Pod *trait.PodTrait `json:"pod,omitempty" property:"pod"` // The configuration of Prometheus trait @@ -256,16 +261,19 @@ type Traits struct { // The configuration of Quarkus trait Quarkus *trait.QuarkusTrait `json:"quarkus,omitempty" property:"quarkus"` // The configuration of Registry trait (support removed since version 2.5.0). + // // Deprecated: use jvm trait or read documentation. Registry *trait.RegistryTrait `json:"registry,omitempty" property:"registry"` - // The configuration of Route trait + // The configuration of Route trait. + // // Deprecated: use ingress instead. Route *trait.RouteTrait `json:"route,omitempty" property:"route"` // The configuration of Security Context trait SecurityContext *trait.SecurityContextTrait `json:"security-context,omitempty" property:"security-context"` // The configuration of Service trait Service *trait.ServiceTrait `json:"service,omitempty" property:"service"` - // The configuration of Service Binding trait + // The configuration of Service Binding trait. + // // Deprecated: no longer in use. ServiceBinding *trait.ServiceBindingTrait `json:"service-binding,omitempty" property:"service-binding"` // The configuration of Telemetry trait @@ -290,15 +298,17 @@ type AddonTrait struct { RawMessage `json:",inline"` } -// A TraitSpec contains the configuration of a trait -// Deprecated: superceded by each Trait type, left for backward compatibility. +// A TraitSpec contains the configuration of a trait. +// +// Deprecated: superseded by each Trait type, left for backward compatibility. type TraitSpec struct { // TraitConfiguration parameters configuration Configuration TraitConfiguration `json:"configuration"` } -// TraitConfiguration represents the expected configuration for a given trait parameter -// Deprecated: superceded by each Trait type, left for backward compatibility. +// TraitConfiguration represents the expected configuration for a given trait parameter. +// +// Deprecated: superseded by each Trait type, left for backward compatibility. type TraitConfiguration struct { // generic raw message, typically a map containing the keys (trait parameters) and the values (either single text or array) RawMessage `json:",inline"` @@ -469,7 +479,8 @@ type SourceSpec struct { // interpret this source at runtime Loader string `json:"loader,omitempty"` // Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - // uses to pre/post process sources + // uses to pre/post process sources. + // // Deprecated: no longer in use. Interceptors []string `json:"interceptors,omitempty"` // Type defines the kind of source described by this object diff --git a/pkg/apis/camel/v1/common_types_support.go b/pkg/apis/camel/v1/common_types_support.go index c77ee1e1d3..1126a4f06e 100644 --- a/pkg/apis/camel/v1/common_types_support.go +++ b/pkg/apis/camel/v1/common_types_support.go @@ -79,11 +79,11 @@ func (t *Traits) Merge(other Traits) error { } // merge them - map1 := make(map[string]interface{}) + map1 := make(map[string]any) if err := json.Unmarshal(data1, &map1); err != nil { return err } - map2 := make(map[string]interface{}) + map2 := make(map[string]any) if err := json.Unmarshal(data2, &map2); err != nil { return err } @@ -117,11 +117,11 @@ func (t *IntegrationKitTraits) Merge(other IntegrationKitTraits) error { } // merge them - map1 := make(map[string]interface{}) + map1 := make(map[string]any) if err := json.Unmarshal(data1, &map1); err != nil { return err } - map2 := make(map[string]interface{}) + map2 := make(map[string]any) if err := json.Unmarshal(data2, &map2); err != nil { return err } diff --git a/pkg/apis/camel/v1/doc.go b/pkg/apis/camel/v1/doc.go index 1f4fbdc322..eecbc6e8d6 100644 --- a/pkg/apis/camel/v1/doc.go +++ b/pkg/apis/camel/v1/doc.go @@ -18,4 +18,6 @@ limitations under the License. // Package v1 contains API Schema definitions for the camel v1 API group // +kubebuilder:object:generate=true // +groupName=camel.apache.org +// +//nolint:godoclint package v1 diff --git a/pkg/apis/camel/v1/error_handler_types_support.go b/pkg/apis/camel/v1/error_handler_types_support.go index 9fa62813c0..7b0629849e 100644 --- a/pkg/apis/camel/v1/error_handler_types_support.go +++ b/pkg/apis/camel/v1/error_handler_types_support.go @@ -28,7 +28,7 @@ import ( type ErrorHandler interface { Type() ErrorHandlerType Endpoint() *Endpoint - Configuration() (map[string]interface{}, error) + Configuration() (map[string]any, error) Validate() error } @@ -47,7 +47,7 @@ func (e *baseErrorHandler) Endpoint() *Endpoint { } // Configuration --. -func (e *baseErrorHandler) Configuration() (map[string]interface{}, error) { +func (e *baseErrorHandler) Configuration() (map[string]any, error) { return nil, nil } @@ -67,8 +67,8 @@ func (e *ErrorHandlerNone) Type() ErrorHandlerType { } // Configuration --. -func (e *ErrorHandlerNone) Configuration() (map[string]interface{}, error) { - return map[string]interface{}{}, nil +func (e *ErrorHandlerNone) Configuration() (map[string]any, error) { + return map[string]any{}, nil } // ErrorHandlerLog represent a default (log) error handler type. @@ -84,13 +84,13 @@ func (e *ErrorHandlerLog) Type() ErrorHandlerType { } // Configuration --. -func (e *ErrorHandlerLog) Configuration() (map[string]interface{}, error) { +func (e *ErrorHandlerLog) Configuration() (map[string]any, error) { properties, err := e.ErrorHandlerNone.Configuration() if err != nil { return nil, err } if e.Parameters != nil { - var parameters map[string]interface{} + var parameters map[string]any err := json.Unmarshal(e.Parameters.RawMessage, ¶meters) if err != nil { return nil, err @@ -118,7 +118,7 @@ func (e *ErrorHandlerSink) Endpoint() *Endpoint { } // Configuration --. -func (e *ErrorHandlerSink) Configuration() (map[string]interface{}, error) { +func (e *ErrorHandlerSink) Configuration() (map[string]any, error) { properties, err := e.ErrorHandlerLog.Configuration() if err != nil { return nil, err diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go index da2c93b542..4234d74add 100644 --- a/pkg/apis/camel/v1/integration_types.go +++ b/pkg/apis/camel/v1/integration_types.go @@ -72,11 +72,12 @@ type IntegrationSpec struct { Profile TraitProfile `json:"profile,omitempty"` // the traits needed to run this Integration Traits Traits `json:"traits,omitempty"` - // Pod template customization - // Deprecated: - // Use container, init-containers or owner traits instead + // Pod template customization. + // + // Deprecated: use container, init-containers or owner traits instead PodTemplate *PodSpecTemplate `json:"template,omitempty"` // Deprecated: + // // Use camel trait (camel.properties) to manage properties // Use mount trait (mount.configs) to manage configs // Use mount trait (mount.resources) to manage resources @@ -118,8 +119,9 @@ type IntegrationStatus struct { RuntimeProvider RuntimeProvider `json:"runtimeProvider,omitempty"` // the catalog used to build/operate the Integration. Catalog *Catalog `json:"catalog,omitempty"` - // Deprecated: - // a list of configuration specification + // a list of configuration specification. + // + // Deprecated: use properties instead. Configuration []ConfigurationSpec `json:"configuration,omitempty"` // a list of events happened for the Integration Conditions []IntegrationCondition `json:"conditions,omitempty"` diff --git a/pkg/apis/camel/v1/integration_types_support.go b/pkg/apis/camel/v1/integration_types_support.go index 0b0b48a712..47c6cf787a 100644 --- a/pkg/apis/camel/v1/integration_types_support.go +++ b/pkg/apis/camel/v1/integration_types_support.go @@ -23,6 +23,7 @@ import ( "fmt" "io" "regexp" + "slices" "strings" yaml2 "gopkg.in/yaml.v2" @@ -186,10 +187,8 @@ func (in *IntegrationSpec) AddDependency(dependency string) { if in.Dependencies == nil { in.Dependencies = make([]string, 0) } - for _, d := range in.Dependencies { - if d == dependency { - return - } + if slices.Contains(in.Dependencies, dependency) { + return } in.Dependencies = append(in.Dependencies, dependency) } @@ -262,7 +261,7 @@ func (in *Integration) Configurations() []ConfigurationSpec { return []ConfigurationSpec{} } - answer := make([]ConfigurationSpec, 0) + answer := make([]ConfigurationSpec, 0, len(in.Status.Configuration)+len(in.Spec.Configuration)) answer = append(answer, in.Status.Configuration...) answer = append(answer, in.Spec.Configuration...) @@ -523,7 +522,7 @@ func ToYamlDSL(flows []Flow) ([]byte, error) { if err != nil { return nil, err } - var jsondata interface{} + var jsondata any d := json.NewDecoder(bytes.NewReader(data)) d.UseNumber() if err := d.Decode(&jsondata); err != nil { diff --git a/pkg/apis/camel/v1/integrationkit_types.go b/pkg/apis/camel/v1/integrationkit_types.go index 2a35d4d4e7..bcb6a9d35f 100644 --- a/pkg/apis/camel/v1/integrationkit_types.go +++ b/pkg/apis/camel/v1/integrationkit_types.go @@ -64,6 +64,7 @@ type IntegrationKitSpec struct { // traits that the kit will execute Traits IntegrationKitTraits `json:"traits,omitempty"` // Deprecated: + // // Use camel trait (camel.properties) to manage properties // Use mount trait (mount.configs) to manage configs // Use mount trait (mount.resources) to manage resources @@ -89,6 +90,7 @@ type IntegrationKitTraits struct { // 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 `json:"quarkus,omitempty" property:"quarkus"` // 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 `json:"registry,omitempty" property:"registry"` // Deprecated: no longer in use. @@ -156,8 +158,9 @@ const ( IntegrationKitTypeUser = "user" // IntegrationKitTypeExternal identifies a Kit created by any third party. IntegrationKitTypeExternal = "external" - // Deprecated: synthetic Integration Kits are replaced by non managed build Integrations. // IntegrationKitTypeSynthetic identifies a synthetic Kit (generated for any container image for which the operator cannot make any assumption). + // + // Deprecated: synthetic Integration Kits are replaced by non managed build Integrations. IntegrationKitTypeSynthetic = "synthetic" // IntegrationKitLayoutLabel labels the kit layout. @@ -166,6 +169,7 @@ const ( // IntegrationKitLayoutFastJar labels a kit using the Quarkus fast-jar packaging. IntegrationKitLayoutFastJar = "fast-jar" // IntegrationKitLayoutNative labels a kit using the Quarkus native packaging. + // // Deprecated: no longer in use. IntegrationKitLayoutNative = "native" // IntegrationKitLayoutNativeSources labels a kit using the Quarkus native-sources packaging. diff --git a/pkg/apis/camel/v1/integrationkit_types_support.go b/pkg/apis/camel/v1/integrationkit_types_support.go index 286b3f7cab..6b7314dee0 100644 --- a/pkg/apis/camel/v1/integrationkit_types_support.go +++ b/pkg/apis/camel/v1/integrationkit_types_support.go @@ -19,6 +19,7 @@ package v1 import ( "path/filepath" + "slices" "strconv" "github.com/apache/camel-k/v2/pkg/util/sets" @@ -109,21 +110,16 @@ func (in *IntegrationKit) IsExternal() bool { return in.Labels[IntegrationKitTypeLabel] == IntegrationKitTypeExternal } -// Deprecated: synthetic Integration Kits are replaced by syntentic Integrations. // IsSynthetic returns true for synthetic IntegrationKits. +// +// Deprecated: synthetic Integration Kits are replaced by syntentic Integrations. func (in *IntegrationKit) IsSynthetic() bool { return in.Labels[IntegrationKitTypeLabel] == IntegrationKitTypeSynthetic } // HasCapability returns true if the Kit is enabled with such a capability. func (in *IntegrationKit) HasCapability(capability string) bool { - for _, cap := range in.Spec.Capabilities { - if cap == capability { - return true - } - } - - return false + return slices.Contains(in.Spec.Capabilities, capability) } // GetCondition returns the condition with the provided type. diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go index 97209eb868..da5bb24cdc 100644 --- a/pkg/apis/camel/v1/integrationplatform_types.go +++ b/pkg/apis/camel/v1/integrationplatform_types.go @@ -37,6 +37,7 @@ type IntegrationPlatformSpec struct { // list of traits to be executed for all the Integration/IntegrationKits built from this IntegrationPlatform Traits Traits `json:"traits,omitempty"` // Deprecated: + // // Use camel trait (camel.properties) to manage properties // Use mount trait (mount.configs) to manage configs // Use mount trait (mount.resources) to manage resources @@ -129,7 +130,8 @@ type IntegrationPlatformBuildSpec struct { BaseImage string `json:"baseImage,omitempty"` // the image registry used to push/pull Integration images Registry RegistrySpec `json:"registry,omitempty"` - // the timeout (in seconds) to use when creating the build tools container image + // the timeout (in seconds) to use when creating the build tools container image. + // // Deprecated: no longer in use BuildCatalogToolTimeout *metav1.Duration `json:"buildCatalogToolTimeout,omitempty"` // how much time to wait before time out the pipeline process @@ -143,6 +145,7 @@ type IntegrationPlatformBuildSpec struct { } // IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform. +// // Deprecated: to be removed in future versions. type IntegrationPlatformKameletSpec struct { // remote repository used to retrieve Kamelet catalog @@ -153,9 +156,10 @@ type IntegrationPlatformKameletSpec struct { type IntegrationPlatformBuildPublishStrategy string const ( - // IntegrationPlatformBuildPublishStrategyJib uses the Source to Images (S2I) feature + // IntegrationPlatformBuildPublishStrategyS2I uses the Source to Images (S2I) feature // (https://docs.openshift.com/container-platform/4.9/openshift_images/create-images.html#images-create-s2i_create-images) // provided by an OpenShift cluster in order to create and push the images to the registry. It is the default choice on OpenShift cluster. + // // Deprecated: use jib or a custom publishing strategy instead. IntegrationPlatformBuildPublishStrategyS2I IntegrationPlatformBuildPublishStrategy = "S2I" // IntegrationPlatformBuildPublishStrategyJib uses Jib maven plugin (https://github.com/GoogleContainerTools/jib) @@ -195,6 +199,7 @@ const ( IntegrationPlatformPhaseCreateCatalog IntegrationPlatformPhase = "CreateCatalog" // IntegrationPlatformConditionReady is the condition if the IntegrationPlatform is ready. + // // Deprecated: use IntegrationPlatformConditionTypeCreated. IntegrationPlatformConditionReady = "Ready" // IntegrationPlatformConditionTypeCreated is the condition if the IntegrationPlatform has been created. diff --git a/pkg/apis/camel/v1/jsonschema_types.go b/pkg/apis/camel/v1/jsonschema_types.go index 41d70a70b8..2b95802390 100644 --- a/pkg/apis/camel/v1/jsonschema_types.go +++ b/pkg/apis/camel/v1/jsonschema_types.go @@ -91,9 +91,9 @@ type JSONSchemaProps struct { Type string `json:"type,omitempty"` } -// +kubebuilder:validation:Type="" // JSON represents any valid JSON value. // These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil. +// +kubebuilder:validation:Type="" type JSON struct { RawMessage `json:",inline"` } diff --git a/pkg/apis/camel/v1/pipe_types.go b/pkg/apis/camel/v1/pipe_types.go index ccdb7ff19d..c5ee49567e 100644 --- a/pkg/apis/camel/v1/pipe_types.go +++ b/pkg/apis/camel/v1/pipe_types.go @@ -137,9 +137,11 @@ const ( // PipeConditionReady --. PipeConditionReady PipeConditionType = "Ready" // PipeIntegrationConditionError -- . + // // Deprecated: no longer in use. PipeIntegrationConditionError PipeConditionType = "IntegrationError" // PipeIntegrationDeprecationNotice -- . + // // Deprecated: no longer in use. PipeIntegrationDeprecationNotice PipeConditionType = "DeprecationNotice" ) diff --git a/pkg/apis/camel/v1/pipe_types_support.go b/pkg/apis/camel/v1/pipe_types_support.go index 173f74d9f2..d66280e9a5 100644 --- a/pkg/apis/camel/v1/pipe_types_support.go +++ b/pkg/apis/camel/v1/pipe_types_support.go @@ -71,7 +71,7 @@ func (in *Pipe) SetOperatorID(operatorID string) { SetAnnotation(&in.ObjectMeta, OperatorIDAnnotation, operatorID) } -// SetTrait add the Trait specification to the Pipe. +// SetTraits add the Trait specification to the Pipe. func (in *Pipe) SetTraits(traits *Traits) { in.Spec.Traits = traits } @@ -162,7 +162,7 @@ func (p *EndpointProperties) GetPropertyMap() (map[string]string, error) { } // Convert json property values to objects before getting their string representation - var props map[string]interface{} + var props map[string]any d := json.NewDecoder(bytes.NewReader(p.RawMessage)) d.UseNumber() if err := d.Decode(&props); err != nil { diff --git a/pkg/apis/camel/v1/register.go b/pkg/apis/camel/v1/register.go index b46b76e29d..7b7416faea 100644 --- a/pkg/apis/camel/v1/register.go +++ b/pkg/apis/camel/v1/register.go @@ -15,11 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// NOTE: Boilerplate only. Ignore this file. - -// Package v1 contains API Schema definitions for the camel v1 API group -// +kubebuilder:object:generate=true -// +groupName=camel.apache.org package v1 import ( diff --git a/pkg/apis/camel/v1/trait/affinity.go b/pkg/apis/camel/v1/trait/affinity.go index 6b64703517..498f35e10a 100644 --- a/pkg/apis/camel/v1/trait/affinity.go +++ b/pkg/apis/camel/v1/trait/affinity.go @@ -23,6 +23,8 @@ package trait // It's disabled by default. // // +camel-k:trait=affinity. +// +//nolint:godoclint type AffinityTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/base.go b/pkg/apis/camel/v1/trait/base.go index 12c4bc2fe5..bcfc28728c 100644 --- a/pkg/apis/camel/v1/trait/base.go +++ b/pkg/apis/camel/v1/trait/base.go @@ -23,6 +23,7 @@ type Trait struct { Enabled *bool `json:"enabled,omitempty" property:"enabled"` // Legacy trait configuration parameters. + // // Deprecated: for backward compatibility. Configuration *Configuration `json:"configuration,omitempty"` } @@ -32,11 +33,13 @@ type PlatformBaseTrait struct { // Deprecated: no longer in use. Enabled *bool `json:"enabled,omitempty" property:"enabled"` // Legacy trait configuration parameters. + // // Deprecated: for backward compatibility. Configuration *Configuration `json:"configuration,omitempty"` } -// Configuration defines the trait structure +// Configuration defines the trait structure. +// // Deprecated: for backward compatibility. type Configuration struct { RawMessage `json:",inline"` @@ -46,5 +49,6 @@ type Configuration struct { // +kubebuilder:validation:Type=object // +kubebuilder:validation:Format="" // +kubebuilder:pruning:PreserveUnknownFields +// // Deprecated: for backward compatibility. type RawMessage []byte //nolint: recvcheck diff --git a/pkg/apis/camel/v1/trait/builder.go b/pkg/apis/camel/v1/trait/builder.go index 6ef4a54c23..aaf2723f97 100644 --- a/pkg/apis/camel/v1/trait/builder.go +++ b/pkg/apis/camel/v1/trait/builder.go @@ -21,11 +21,14 @@ package trait // build and configure IntegrationKits. // // +camel-k:trait=builder. +// +//nolint:godoclint type BuilderTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` // Enable verbose logging on build components that support it (e.g. Kaniko build pod). - // Deprecated no longer in use + // + // Deprecated: no longer in use Verbose *bool `json:"verbose,omitempty" property:"verbose"` // A list of properties to be provided to the build task Properties []string `json:"properties,omitempty" property:"properties"` @@ -41,15 +44,19 @@ type BuilderTrait struct { // +kubebuilder:validation:Enum=dependencies;fifo;sequential OrderStrategy string `json:"orderStrategy,omitempty" property:"order-strategy"` // When using `pod` strategy, the minimum amount of CPU required by the pod builder. + // // Deprecated: use TasksRequestCPU instead with task name `builder`. RequestCPU string `json:"requestCPU,omitempty" property:"request-cpu"` // When using `pod` strategy, the minimum amount of memory required by the pod builder. + // // Deprecated: use TasksRequestCPU instead with task name `builder`. RequestMemory string `json:"requestMemory,omitempty" property:"request-memory"` // When using `pod` strategy, the maximum amount of CPU required by the pod builder. + // // Deprecated: use TasksRequestCPU instead with task name `builder`. LimitCPU string `json:"limitCPU,omitempty" property:"limit-cpu"` // When using `pod` strategy, the maximum amount of memory required by the pod builder. + // // Deprecated: use TasksRequestCPU instead with task name `builder`. LimitMemory string `json:"limitMemory,omitempty" property:"limit-memory"` // A list of references pointing to configmaps/secrets that contains a maven profile. diff --git a/pkg/apis/camel/v1/trait/camel.go b/pkg/apis/camel/v1/trait/camel.go index ff8e2ba736..08d63d27d8 100644 --- a/pkg/apis/camel/v1/trait/camel.go +++ b/pkg/apis/camel/v1/trait/camel.go @@ -20,6 +20,8 @@ package trait // The Camel trait can be used to configure versions of Apache Camel K runtime and related libraries, it cannot be disabled. // // +camel-k:trait=camel. +// +//nolint:godoclint type CamelTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/container.go b/pkg/apis/camel/v1/trait/container.go index c5bb18e29d..2073840fb6 100644 --- a/pkg/apis/camel/v1/trait/container.go +++ b/pkg/apis/camel/v1/trait/container.go @@ -24,6 +24,8 @@ import corev1 "k8s.io/api/core/v1" // It also provides configuration for Services associated to the container. // // +camel-k:trait=container. +// +//nolint:godoclint type ContainerTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/cron.go b/pkg/apis/camel/v1/trait/cron.go index b98b03734f..60aa73db5a 100644 --- a/pkg/apis/camel/v1/trait/cron.go +++ b/pkg/apis/camel/v1/trait/cron.go @@ -37,6 +37,8 @@ package trait // `cron:tab?schedule=0/2 * * * ?` or `quartz:trigger?cron=0 0/2 * * * ?`. // // +camel-k:trait=cron. +// +//nolint:godoclint type CronTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/dependencies.go b/pkg/apis/camel/v1/trait/dependencies.go index 167df7990f..632912d979 100644 --- a/pkg/apis/camel/v1/trait/dependencies.go +++ b/pkg/apis/camel/v1/trait/dependencies.go @@ -22,6 +22,8 @@ package trait // // +camel-k:trait=dependencies. // +camel-k:internal. +// +//nolint:godoclint type DependenciesTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` } diff --git a/pkg/apis/camel/v1/trait/deployer.go b/pkg/apis/camel/v1/trait/deployer.go index e822adfbc2..ff9b18897c 100644 --- a/pkg/apis/camel/v1/trait/deployer.go +++ b/pkg/apis/camel/v1/trait/deployer.go @@ -21,13 +21,16 @@ package trait // to explicitly select the underlying controller that will manage the integration pods. // // +camel-k:trait=deployer. +// +//nolint:godoclint type DeployerTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` - // Deprecated: this feature will be removed in future releases. // Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` // when creating the resources for running the integration. // +kubebuilder:validation:Enum=deployment;cron-job;knative-service + // + // Deprecated: this feature will be removed in future releases. Kind string `json:"kind,omitempty" property:"kind"` // Deprecated: no longer in use. UseSSA *bool `json:"useSSA,omitempty" property:"use-ssa"` diff --git a/pkg/apis/camel/v1/trait/deployment.go b/pkg/apis/camel/v1/trait/deployment.go index 86dd834da8..180068b070 100644 --- a/pkg/apis/camel/v1/trait/deployment.go +++ b/pkg/apis/camel/v1/trait/deployment.go @@ -26,6 +26,8 @@ import ( // the integration will run in the cluster. // // +camel-k:trait=deployment. +// +//nolint:godoclint type DeploymentTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/environment.go b/pkg/apis/camel/v1/trait/environment.go index 4f9dafd702..15831ab48e 100644 --- a/pkg/apis/camel/v1/trait/environment.go +++ b/pkg/apis/camel/v1/trait/environment.go @@ -21,6 +21,8 @@ package trait // such as `NAMESPACE`, `POD_NAME` and others. // // +camel-k:trait=environment. +// +//nolint:godoclint type EnvironmentTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/error_handler.go b/pkg/apis/camel/v1/trait/error_handler.go index 4670522b4f..0b7cfcef9e 100644 --- a/pkg/apis/camel/v1/trait/error_handler.go +++ b/pkg/apis/camel/v1/trait/error_handler.go @@ -23,6 +23,8 @@ package trait // // +camel-k:trait=error-handler. // +camel-k:internal. +// +//nolint:godoclint type ErrorHandlerTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/gc.go b/pkg/apis/camel/v1/trait/gc.go index 799e55f3b7..7587c9625e 100644 --- a/pkg/apis/camel/v1/trait/gc.go +++ b/pkg/apis/camel/v1/trait/gc.go @@ -21,13 +21,17 @@ package trait // // +camel-k:trait=gc. // +camel-k:internal. +// +//nolint:godoclint type GCTrait struct { Trait `json:",inline" property:",squash"` // Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + // // Deprecated: no longer in use. DiscoveryCache *DiscoveryCacheType `json:"discoveryCache,omitempty" property:"discovery-cache"` } +// DiscoveryCacheType --. // +kubebuilder:validation:Enum=disabled;disk;memory type DiscoveryCacheType string diff --git a/pkg/apis/camel/v1/trait/gitops.go b/pkg/apis/camel/v1/trait/gitops.go index b6d406278d..b5769b6f69 100644 --- a/pkg/apis/camel/v1/trait/gitops.go +++ b/pkg/apis/camel/v1/trait/gitops.go @@ -22,6 +22,8 @@ package trait // to pull the project. // // +camel-k:trait=gitops. +// +//nolint:godoclint type GitOpsTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/health.go b/pkg/apis/camel/v1/trait/health.go index 35e6c08c9d..b4fe57ee59 100644 --- a/pkg/apis/camel/v1/trait/health.go +++ b/pkg/apis/camel/v1/trait/health.go @@ -22,6 +22,8 @@ package trait // NOTE: this trait is disabled by default. // // +camel-k:trait=health. +// +//nolint:godoclint type HealthTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/ingress.go b/pkg/apis/camel/v1/trait/ingress.go index 354ed0172a..0768998ca5 100644 --- a/pkg/apis/camel/v1/trait/ingress.go +++ b/pkg/apis/camel/v1/trait/ingress.go @@ -25,6 +25,8 @@ import networkingv1 "k8s.io/api/networking/v1" // It's enabled by default whenever a Service is added to the integration (through the `service` trait). // // +camel-k:trait=ingress. +// +//nolint:godoclint type IngressTrait struct { Trait `json:",inline" property:",squash"` @@ -38,6 +40,7 @@ type IngressTrait struct { // To configure the host exposed by the ingress. Host string `json:"host,omitempty" property:"host"` // To configure the path exposed by the ingress (default `/`). + // // Deprecated: In favor of `paths` - left for backward compatibility. Path string `json:"path,omitempty" property:"path"` // To configure the paths exposed by the ingress (default `['/']`). diff --git a/pkg/apis/camel/v1/trait/init_containers.go b/pkg/apis/camel/v1/trait/init_containers.go index bbb0272b00..8e9a67c5f0 100644 --- a/pkg/apis/camel/v1/trait/init_containers.go +++ b/pkg/apis/camel/v1/trait/init_containers.go @@ -17,9 +17,11 @@ limitations under the License. package trait -// The InitContainersTrait trait can be used to configure `init containers` or `sidecar containers`. +// The Init Containers trait can be used to configure `init containers` or `sidecar containers`. // // +camel-k:trait=init-containers. +// +//nolint:godoclint type InitContainersTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/istio.go b/pkg/apis/camel/v1/trait/istio.go index 3164a3a5ca..f84c552114 100644 --- a/pkg/apis/camel/v1/trait/istio.go +++ b/pkg/apis/camel/v1/trait/istio.go @@ -21,6 +21,8 @@ package trait // such as sidecar injection and outbound IP ranges. // // +camel-k:trait=istio. +// +//nolint:godoclint type IstioTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/jolokia.go b/pkg/apis/camel/v1/trait/jolokia.go index bf45d36fd2..4a2ec8d7d2 100644 --- a/pkg/apis/camel/v1/trait/jolokia.go +++ b/pkg/apis/camel/v1/trait/jolokia.go @@ -28,6 +28,8 @@ package trait // // +camel-k:trait=jolokia. // +camel-k:deprecated=2.8.0. +// +//nolint:godoclint type JolokiaTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/jvm.go b/pkg/apis/camel/v1/trait/jvm.go index 8818760450..6ce82cab63 100644 --- a/pkg/apis/camel/v1/trait/jvm.go +++ b/pkg/apis/camel/v1/trait/jvm.go @@ -22,6 +22,8 @@ package trait // trait is disabled by the platform. // // +camel-k:trait=jvm. +// +//nolint:godoclint type JVMTrait struct { Trait `json:",inline" property:",squash"` @@ -29,7 +31,8 @@ type JVMTrait struct { Debug *bool `json:"debug,omitempty" property:"debug"` // Suspends the target JVM immediately before the main class is loaded DebugSuspend *bool `json:"debugSuspend,omitempty" property:"debug-suspend"` - // Prints the command used the start the JVM in the container logs (default `true`) + // Prints the command used the start the JVM in the container logs (default `true`). + // // Deprecated: no longer in use. PrintCommand *bool `json:"printCommand,omitempty" property:"print-command"` // Transport address at which to listen for the newly launched JVM (default `*:5005`) diff --git a/pkg/apis/camel/v1/trait/kamelets.go b/pkg/apis/camel/v1/trait/kamelets.go index 9b7d6bfd5e..c2c0c0607e 100644 --- a/pkg/apis/camel/v1/trait/kamelets.go +++ b/pkg/apis/camel/v1/trait/kamelets.go @@ -20,6 +20,8 @@ package trait // The kamelets trait is a platform trait used to inject Kamelets into the integration runtime. // // +camel-k:trait=kamelets. +// +//nolint:godoclint type KameletsTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/keda.go b/pkg/apis/camel/v1/trait/keda.go index ade26692c1..b20b6a9745 100644 --- a/pkg/apis/camel/v1/trait/keda.go +++ b/pkg/apis/camel/v1/trait/keda.go @@ -20,6 +20,8 @@ package trait // The KEDA trait allows you to configure KEDA autoscalers to scale up and down based of events. // // +camel-k:trait=keda. +// +//nolint:godoclint type KedaTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/knative.go b/pkg/apis/camel/v1/trait/knative.go index a5fd5d7d5d..55d939eeca 100644 --- a/pkg/apis/camel/v1/trait/knative.go +++ b/pkg/apis/camel/v1/trait/knative.go @@ -25,6 +25,8 @@ package trait // The trait is enabled by default when the Knative profile is active. // // +camel-k:trait=knative. +// +//nolint:godoclint type KnativeTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/knative_service.go b/pkg/apis/camel/v1/trait/knative_service.go index ffe44b25a4..08a8d49737 100644 --- a/pkg/apis/camel/v1/trait/knative_service.go +++ b/pkg/apis/camel/v1/trait/knative_service.go @@ -24,6 +24,8 @@ package trait // are only relevant when the Camel route(s) use(s) an HTTP endpoint consumer. // // +camel-k:trait=knative-service. +// +//nolint:godoclint type KnativeServiceTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/logging.go b/pkg/apis/camel/v1/trait/logging.go index f1d3e3a729..4dfc4a1776 100644 --- a/pkg/apis/camel/v1/trait/logging.go +++ b/pkg/apis/camel/v1/trait/logging.go @@ -30,6 +30,8 @@ package trait // // +camel-k:trait=logging. // +camel-k:deprecated=2.9.0. +// +//nolint:godoclint type LoggingTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/master.go b/pkg/apis/camel/v1/trait/master.go index a7bf4bb020..9388d2a382 100644 --- a/pkg/apis/camel/v1/trait/master.go +++ b/pkg/apis/camel/v1/trait/master.go @@ -36,6 +36,8 @@ package trait // // +camel-k:trait=master. // +camel-k:deprecated=2.9.0. +// +//nolint:godoclint type MasterTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/mount.go b/pkg/apis/camel/v1/trait/mount.go index 882d7e32cc..cf40a66f58 100644 --- a/pkg/apis/camel/v1/trait/mount.go +++ b/pkg/apis/camel/v1/trait/mount.go @@ -20,6 +20,8 @@ package trait // The Mount trait can be used to configure volumes mounted on the Integration Pods. // // +camel-k:trait=mount. +// +//nolint:godoclint type MountTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/openapi.go b/pkg/apis/camel/v1/trait/openapi.go index fae3559ce3..66124ae7ef 100644 --- a/pkg/apis/camel/v1/trait/openapi.go +++ b/pkg/apis/camel/v1/trait/openapi.go @@ -26,6 +26,8 @@ package trait // // +camel-k:trait=openapi. // +camel-k:internal. +// +//nolint:godoclint type OpenAPITrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/owner.go b/pkg/apis/camel/v1/trait/owner.go index f5d952e3ee..d3bedeea9c 100644 --- a/pkg/apis/camel/v1/trait/owner.go +++ b/pkg/apis/camel/v1/trait/owner.go @@ -21,6 +21,8 @@ package trait // and transfers annotations and labels on the integration onto these owned resources. // // +camel-k:trait=owner. +// +//nolint:godoclint type OwnerTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/pdb.go b/pkg/apis/camel/v1/trait/pdb.go index 3e158532ee..870ca25e5c 100644 --- a/pkg/apis/camel/v1/trait/pdb.go +++ b/pkg/apis/camel/v1/trait/pdb.go @@ -20,6 +20,8 @@ package trait // The PDB trait allows to configure the PodDisruptionBudget resource for the Integration pods. // // +camel-k:trait=pdb. +// +//nolint:godoclint type PDBTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/platform.go b/pkg/apis/camel/v1/trait/platform.go index 9b338fb254..3025a2629f 100644 --- a/pkg/apis/camel/v1/trait/platform.go +++ b/pkg/apis/camel/v1/trait/platform.go @@ -21,6 +21,8 @@ package trait // // +camel-k:trait=platform. // +camel-k:internal. +// +//nolint:godoclint type PlatformTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/pod.go b/pkg/apis/camel/v1/trait/pod.go index ad7a647698..0c29e9bb6a 100644 --- a/pkg/apis/camel/v1/trait/pod.go +++ b/pkg/apis/camel/v1/trait/pod.go @@ -29,6 +29,8 @@ package trait // // +camel-k:trait=pod. // +camel-k:deprecated=2.8.0. +// +//nolint:godoclint type PodTrait struct { Trait `json:",inline" property:",squash"` } diff --git a/pkg/apis/camel/v1/trait/prometheus.go b/pkg/apis/camel/v1/trait/prometheus.go index 642eb5f695..aa1c508863 100644 --- a/pkg/apis/camel/v1/trait/prometheus.go +++ b/pkg/apis/camel/v1/trait/prometheus.go @@ -31,6 +31,8 @@ package trait // The Prometheus trait is disabled by default. // // +camel-k:trait=prometheus. +// +//nolint:godoclint type PrometheusTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/pull_secret.go b/pkg/apis/camel/v1/trait/pull_secret.go index c84b20519c..53249ee839 100644 --- a/pkg/apis/camel/v1/trait/pull_secret.go +++ b/pkg/apis/camel/v1/trait/pull_secret.go @@ -29,6 +29,8 @@ package trait // If your registry does not need authentication for pulling images, you can disable this trait. // // +camel-k:trait=pull-secret. +// +//nolint:godoclint type PullSecretTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/quarkus.go b/pkg/apis/camel/v1/trait/quarkus.go index cf44c9b3fa..a14f1c86e2 100644 --- a/pkg/apis/camel/v1/trait/quarkus.go +++ b/pkg/apis/camel/v1/trait/quarkus.go @@ -26,6 +26,8 @@ package trait // 4GiB of memory, so the Pod running the native build, must have enough memory available. // // +camel-k:trait=quarkus. +// +//nolint:godoclint type QuarkusTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` @@ -35,6 +37,7 @@ type QuarkusTrait struct { // The order influences the resolution of the current kit for the integration. // The kit corresponding to the first package type will be assigned to the // integration in case no existing kit that matches the integration exists. + // // Deprecated: use `build-mode` instead. PackageTypes []QuarkusPackageType `json:"packageTypes,omitempty" property:"package-type"` // The Quarkus mode to run: either `jvm` or `native` (default `jvm`). @@ -59,6 +62,7 @@ const ( ) // QuarkusPackageType is the type of Quarkus build packaging. +// // Deprecated: use `QuarkusMode` instead. // +kubebuilder:validation:Enum=fast-jar;native type QuarkusPackageType string diff --git a/pkg/apis/camel/v1/trait/registry.go b/pkg/apis/camel/v1/trait/registry.go index 053650fefb..2c59d721eb 100644 --- a/pkg/apis/camel/v1/trait/registry.go +++ b/pkg/apis/camel/v1/trait/registry.go @@ -24,6 +24,8 @@ package trait // // +camel-k:trait=registry. // +camel-k:internal. +// +//nolint:godoclint type RegistryTrait struct { Trait `json:",inline" property:",squash"` } diff --git a/pkg/apis/camel/v1/trait/route.go b/pkg/apis/camel/v1/trait/route.go index ec110e552a..bdaf538f51 100644 --- a/pkg/apis/camel/v1/trait/route.go +++ b/pkg/apis/camel/v1/trait/route.go @@ -31,6 +31,8 @@ package trait // // +camel-k:trait=route. // +camel-k:deprecated=2.6.0. +// +//nolint:godoclint type RouteTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/security_context.go b/pkg/apis/camel/v1/trait/security_context.go index b90dd4ff19..01b79bcbfb 100644 --- a/pkg/apis/camel/v1/trait/security_context.go +++ b/pkg/apis/camel/v1/trait/security_context.go @@ -22,6 +22,8 @@ import corev1 "k8s.io/api/core/v1" // The Security Context trait can be used to configure the security setting of the Pod running the application. // // +camel-k:trait=security-context. +// +//nolint:godoclint type SecurityContextTrait struct { PlatformBaseTrait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/service.go b/pkg/apis/camel/v1/trait/service.go index fdc0c996ac..ca3b58509f 100644 --- a/pkg/apis/camel/v1/trait/service.go +++ b/pkg/apis/camel/v1/trait/service.go @@ -25,12 +25,15 @@ package trait // It's enabled by default if the integration depends on a Camel component that can expose a HTTP endpoint. // // +camel-k:trait=service. +// +//nolint:godoclint type ServiceTrait struct { Trait `json:",inline" property:",squash"` // To automatically detect from the code if a Service needs to be created. Auto *bool `json:"auto,omitempty" property:"auto"` // Enable Service to be exposed as NodePort (default `false`). + // // Deprecated: Use service type instead. NodePort *bool `json:"nodePort,omitempty" property:"node-port"` // The type of service to be used, either 'ClusterIP', 'NodePort' or 'LoadBalancer'. diff --git a/pkg/apis/camel/v1/trait/service_binding.go b/pkg/apis/camel/v1/trait/service_binding.go index 341506a95a..1719fc81e8 100644 --- a/pkg/apis/camel/v1/trait/service_binding.go +++ b/pkg/apis/camel/v1/trait/service_binding.go @@ -26,6 +26,8 @@ package trait // // +camel-k:trait=service-binding. // +camel-k:internal. +// +//nolint:godoclint type ServiceBindingTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/telemetry.go b/pkg/apis/camel/v1/trait/telemetry.go index 7aa023fab3..4a48f4e654 100644 --- a/pkg/apis/camel/v1/trait/telemetry.go +++ b/pkg/apis/camel/v1/trait/telemetry.go @@ -35,6 +35,8 @@ package trait // // +camel-k:trait=telemetry. // +camel-k:deprecated=2.9.0. +// +//nolint:godoclint type TelemetryTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/camel/v1/trait/toleration.go b/pkg/apis/camel/v1/trait/toleration.go index b6a94a9696..0e81fee66f 100644 --- a/pkg/apis/camel/v1/trait/toleration.go +++ b/pkg/apis/camel/v1/trait/toleration.go @@ -31,6 +31,8 @@ package trait // It's disabled by default. // // +camel-k:trait=toleration. +// +//nolint:godoclint type TolerationTrait struct { Trait `json:",inline" property:",squash"` diff --git a/pkg/apis/duck/keda/v1alpha1/doc.go b/pkg/apis/duck/keda/v1alpha1/doc.go index 0ce22d97c0..b374833679 100644 --- a/pkg/apis/duck/keda/v1alpha1/doc.go +++ b/pkg/apis/duck/keda/v1alpha1/doc.go @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package duck contains a partial schema of the KEDA APIs +// Package v1alpha1 contains a partial schema of the KEDA APIs // +kubebuilder:object:generate=true // +groupName=keda.sh package v1alpha1 diff --git a/pkg/apis/duck/keda/v1alpha1/duck_types.go b/pkg/apis/duck/keda/v1alpha1/duck_types.go index cb2cbb14f4..112e700dfc 100644 --- a/pkg/apis/duck/keda/v1alpha1/duck_types.go +++ b/pkg/apis/duck/keda/v1alpha1/duck_types.go @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package duck contains duck-types for accessing Keda resources package v1alpha1 import ( diff --git a/pkg/apis/duck/strimzi/v1beta2/doc.go b/pkg/apis/duck/strimzi/v1beta2/doc.go index 26d9567dcf..e069e5b344 100644 --- a/pkg/apis/duck/strimzi/v1beta2/doc.go +++ b/pkg/apis/duck/strimzi/v1beta2/doc.go @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package duck contains a partial schema of the Strimzi APIs +// Package v1beta2 contains a partial schema of the Strimzi APIs // +kubebuilder:object:generate=true // +groupName=kafka.strimzi.io package v1beta2 diff --git a/pkg/apis/duck/strimzi/v1beta2/duck_types.go b/pkg/apis/duck/strimzi/v1beta2/duck_types.go index 5a187e58f7..cb305d6d87 100644 --- a/pkg/apis/duck/strimzi/v1beta2/duck_types.go +++ b/pkg/apis/duck/strimzi/v1beta2/duck_types.go @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package duck contains duck-types for accessing Strimzi resources package v1beta2 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/builder/project.go b/pkg/builder/project.go index 51971abeee..39fb5430b1 100644 --- a/pkg/builder/project.go +++ b/pkg/builder/project.go @@ -149,7 +149,7 @@ func injectServersIntoMavenSettings(settings string, servers []v1.Server) string return newSettings[:i] + string(content) + newSettings[i:] } -func encodeXMLNoHeader(content interface{}) ([]byte, error) { +func encodeXMLNoHeader(content any) ([]byte, error) { w := &bytes.Buffer{} w.WriteString("\n") e := xml.NewEncoder(w) diff --git a/pkg/builder/steps.go b/pkg/builder/steps.go index f2d0d19aef..731edfb54b 100644 --- a/pkg/builder/steps.go +++ b/pkg/builder/steps.go @@ -71,7 +71,7 @@ func StepsFrom(ids ...string) ([]Step, error) { } func StepIDsFor(steps ...Step) []string { - IDs := make([]string, 0) + IDs := make([]string, 0, len(steps)) for _, step := range steps { IDs = append(IDs, step.ID()) } @@ -79,7 +79,7 @@ func StepIDsFor(steps ...Step) []string { return IDs } -func registerSteps(steps interface{}) { +func registerSteps(steps any) { v := reflect.ValueOf(steps) t := reflect.TypeOf(steps) diff --git a/pkg/builder/tasks.go b/pkg/builder/tasks.go index 3861aa908f..159bfb806a 100644 --- a/pkg/builder/tasks.go +++ b/pkg/builder/tasks.go @@ -55,6 +55,7 @@ func (b *Build) Task(task v1.Task) Task { build: b.build, task: task.Package, } + //nolint:staticcheck case task.S2i != nil: return &s2iTask{ c: b.builder.client, @@ -134,6 +135,7 @@ func (b *Build) TaskByName(name string) Task { build: b.build, task: task.Package, } + //nolint:staticcheck case task.S2i != nil && task.S2i.Name == name: return &s2iTask{ c: b.builder.client, diff --git a/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go b/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go index 3253145d40..cb6c17c659 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go @@ -25,7 +25,10 @@ import ( // AddonTraitApplyConfiguration represents a declarative configuration of the AddonTrait type for use // with apply. +// +// AddonTrait represents the configuration of an addon trait. type AddonTraitApplyConfiguration struct { + // Generic raw message, typically a map containing the keys (trait parameters) and the values (either single text or array) camelv1.RawMessage `json:",inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/artifact.go b/pkg/client/camel/applyconfiguration/camel/v1/artifact.go index 223c56bcc6..9abf105852 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/artifact.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/artifact.go @@ -21,10 +21,16 @@ package v1 // ArtifactApplyConfiguration represents a declarative configuration of the Artifact type for use // with apply. +// +// Artifact represents a materialized artifact (a jar dependency or in general a file used by the build). type ArtifactApplyConfiguration struct { - ID *string `json:"id,omitempty"` + // the identification (GAV for maven dependencies or file name for other file types) + ID *string `json:"id,omitempty"` + // where it is located in the builder `Pod` Location *string `json:"location,omitempty"` - Target *string `json:"target,omitempty"` + // the expected location in the runtime + Target *string `json:"target,omitempty"` + // a checksum (SHA1) of the content Checksum *string `json:"checksum,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/basetask.go b/pkg/client/camel/applyconfiguration/camel/v1/basetask.go index 43832237a4..e0a0462dd0 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/basetask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/basetask.go @@ -21,8 +21,12 @@ package v1 // BaseTaskApplyConfiguration represents a declarative configuration of the BaseTask type for use // with apply. +// +// BaseTask is a base for the struct hierarchy. type BaseTaskApplyConfiguration struct { - Name *string `json:"name,omitempty"` + // name of the task + Name *string `json:"name,omitempty"` + // The configuration that should be used to perform the Build. Configuration *BuildConfigurationApplyConfiguration `json:"configuration,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/build.go b/pkg/client/camel/applyconfiguration/camel/v1/build.go index 4485c947fe..004251e2fc 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/build.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/build.go @@ -27,6 +27,9 @@ import ( // BuildApplyConfiguration represents a declarative configuration of the Build type for use // with apply. +// +// Change format to 'duration' when CRD uses OpenAPI spec v3 (https://github.com/OAI/OpenAPI-Specification/issues/845) +// Build is the Schema for the builds API. type BuildApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` @@ -44,6 +47,7 @@ func Build(name, namespace string) *BuildApplyConfiguration { b.WithAPIVersion("camel.apache.org/v1") return b } + func (b BuildApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildahtask.go b/pkg/client/camel/applyconfiguration/camel/v1/buildahtask.go index 64b08b0217..1b2a96fba4 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/buildahtask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/buildahtask.go @@ -21,12 +21,19 @@ package v1 // BuildahTaskApplyConfiguration represents a declarative configuration of the BuildahTask type for use // with apply. +// +// BuildahTask is used to configure Buildah. +// +// Deprecated: no longer in use. type BuildahTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` PublishTaskApplyConfiguration `json:",inline"` - Platform *string `json:"platform,omitempty"` - Verbose *bool `json:"verbose,omitempty"` - ExecutorImage *string `json:"executorImage,omitempty"` + // The platform of build image + Platform *string `json:"platform,omitempty"` + // log more information + Verbose *bool `json:"verbose,omitempty"` + // docker image to use + ExecutorImage *string `json:"executorImage,omitempty"` } // BuildahTaskApplyConfiguration constructs a declarative configuration of the BuildahTask type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go index 0cc3b957c2..16fb0ba3e2 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go @@ -27,13 +27,21 @@ import ( // BuildConditionApplyConfiguration represents a declarative configuration of the BuildCondition type for use // with apply. +// +// BuildCondition describes the state of a resource at a certain point. type BuildConditionApplyConfiguration struct { - Type *camelv1.BuildConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + // Type of integration condition. + Type *camelv1.BuildConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` } // BuildConditionApplyConfiguration constructs a declarative configuration of the BuildCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go b/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go index 0963a90ff8..1a0e234672 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/buildconfiguration.go @@ -25,18 +25,31 @@ import ( // BuildConfigurationApplyConfiguration represents a declarative configuration of the BuildConfiguration type for use // with apply. +// +// BuildConfiguration represent the configuration required to build the runtime. type BuildConfigurationApplyConfiguration struct { - ToolImage *string `json:"toolImage,omitempty"` - BuilderPodNamespace *string `json:"operatorNamespace,omitempty"` - Strategy *camelv1.BuildStrategy `json:"strategy,omitempty"` - OrderStrategy *camelv1.BuildOrderStrategy `json:"orderStrategy,omitempty"` - RequestCPU *string `json:"requestCPU,omitempty"` - RequestMemory *string `json:"requestMemory,omitempty"` - LimitCPU *string `json:"limitCPU,omitempty"` - LimitMemory *string `json:"limitMemory,omitempty"` - NodeSelector map[string]string `json:"nodeSelector,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` - ImagePlatforms []string `json:"platforms,omitempty"` + // The container image to be used to run the build. + ToolImage *string `json:"toolImage,omitempty"` + // The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation). + BuilderPodNamespace *string `json:"operatorNamespace,omitempty"` + // the strategy to adopt + Strategy *camelv1.BuildStrategy `json:"strategy,omitempty"` + // the build order strategy to adopt + OrderStrategy *camelv1.BuildOrderStrategy `json:"orderStrategy,omitempty"` + // The minimum amount of CPU required. Only used for `pod` strategy + RequestCPU *string `json:"requestCPU,omitempty"` + // The minimum amount of memory required. Only used for `pod` strategy + RequestMemory *string `json:"requestMemory,omitempty"` + // The maximum amount of CPU required. Only used for `pod` strategy + LimitCPU *string `json:"limitCPU,omitempty"` + // The maximum amount of memory required. Only used for `pod` strategy + LimitMemory *string `json:"limitMemory,omitempty"` + // The node selector for the builder pod. Only used for `pod` strategy + NodeSelector map[string]string `json:"nodeSelector,omitempty"` + // Annotation to use for the builder pod. Only used for `pod` strategy + Annotations map[string]string `json:"annotations,omitempty"` + // The list of platforms used in order to build a container image. + ImagePlatforms []string `json:"platforms,omitempty"` } // BuildConfigurationApplyConfiguration constructs a declarative configuration of the BuildConfiguration type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildertask.go b/pkg/client/camel/applyconfiguration/camel/v1/buildertask.go index 025aa38acb..2cd7c91361 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/buildertask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/buildertask.go @@ -21,16 +21,26 @@ package v1 // BuilderTaskApplyConfiguration represents a declarative configuration of the BuilderTask type for use // with apply. +// +// BuilderTask is the generic task in charge of building the application image. type BuilderTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` - BaseImage *string `json:"baseImage,omitempty"` - Runtime *RuntimeSpecApplyConfiguration `json:"runtime,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Steps []string `json:"steps,omitempty"` - Maven *MavenBuildSpecApplyConfiguration `json:"maven,omitempty"` - BuildDir *string `json:"buildDir,omitempty"` - Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` - Git *GitConfigSpecApplyConfiguration `json:"git,omitempty"` + // the base image layer + BaseImage *string `json:"baseImage,omitempty"` + // the configuration required for the runtime application + Runtime *RuntimeSpecApplyConfiguration `json:"runtime,omitempty"` + // the list of dependencies to use for this build + Dependencies []string `json:"dependencies,omitempty"` + // the list of steps to execute (see pkg/builder/) + Steps []string `json:"steps,omitempty"` + // the configuration required by Maven for the application build phase + Maven *MavenBuildSpecApplyConfiguration `json:"maven,omitempty"` + // workspace directory to use + BuildDir *string `json:"buildDir,omitempty"` + // the sources to add at build time + Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` + // the configuration of the project to build on Git + Git *GitConfigSpecApplyConfiguration `json:"git,omitempty"` } // BuilderTaskApplyConfiguration constructs a declarative configuration of the BuilderTask type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go index d07fbd60f9..e77fb6404c 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go @@ -25,13 +25,35 @@ import ( // BuildSpecApplyConfiguration represents a declarative configuration of the BuildSpec type for use // with apply. +// +// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. +// Important: Run "make generate-deepcopy" to regenerate code after modifying this file +// BuildSpec defines the list of tasks to be execute for a Build. From Camel K version 2, it would be more appropriate +// to think it as pipeline. type BuildSpecApplyConfiguration struct { - Tasks []TaskApplyConfiguration `json:"tasks,omitempty"` - Configuration *BuildConfigurationApplyConfiguration `json:"configuration,omitempty"` - ToolImage *string `json:"toolImage,omitempty"` - BuilderPodNamespace *string `json:"operatorNamespace,omitempty"` - Timeout *metav1.Duration `json:"timeout,omitempty"` - MaxRunningBuilds *int32 `json:"maxRunningBuilds,omitempty"` + // The sequence of tasks (pipeline) to be performed. + Tasks []TaskApplyConfiguration `json:"tasks,omitempty"` + // The configuration that should be used to perform the Build. + // + // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility + Configuration *BuildConfigurationApplyConfiguration `json:"configuration,omitempty"` + // The container image to be used to run the build. + // + // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility + ToolImage *string `json:"toolImage,omitempty"` + // The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation). + // + // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility + BuilderPodNamespace *string `json:"operatorNamespace,omitempty"` + // Timeout defines the Build maximum execution duration. + // The Build deadline is set to the Build start time plus the Timeout duration. + // If the Build deadline is exceeded, the Build context is canceled, + // and its phase set to BuildPhaseFailed. + Timeout *metav1.Duration `json:"timeout,omitempty"` + // the maximum amount of parallel running builds started by this operator instance. + // + // Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility + MaxRunningBuilds *int32 `json:"maxRunningBuilds,omitempty"` } // BuildSpecApplyConfiguration constructs a declarative configuration of the BuildSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go index 5551c83588..e4fdb31f11 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go @@ -26,19 +26,35 @@ import ( // BuildStatusApplyConfiguration represents a declarative configuration of the BuildStatus type for use // with apply. +// +// BuildStatus defines the observed state of Build. type BuildStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.BuildPhase `json:"phase,omitempty"` - Image *string `json:"image,omitempty"` - Digest *string `json:"digest,omitempty"` - RootImage *string `json:"rootImage,omitempty"` - BaseImage *string `json:"baseImage,omitempty"` - Artifacts []ArtifactApplyConfiguration `json:"artifacts,omitempty"` - Error *string `json:"error,omitempty"` - Failure *FailureApplyConfiguration `json:"failure,omitempty"` - StartedAt *metav1.Time `json:"startedAt,omitempty"` - Conditions []BuildConditionApplyConfiguration `json:"conditions,omitempty"` - Duration *string `json:"duration,omitempty"` + // ObservedGeneration is the most recent generation observed for this Build. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // describes the phase + Phase *camelv1.BuildPhase `json:"phase,omitempty"` + // the image name built + Image *string `json:"image,omitempty"` + // the digest from image + Digest *string `json:"digest,omitempty"` + // root image (the first image from which the incremental image has started) + RootImage *string `json:"rootImage,omitempty"` + // the base image used for this build + BaseImage *string `json:"baseImage,omitempty"` + // a list of artifacts contained in the build + Artifacts []ArtifactApplyConfiguration `json:"artifacts,omitempty"` + // the error description (if any) + Error *string `json:"error,omitempty"` + // the reason of the failure (if any) + Failure *FailureApplyConfiguration `json:"failure,omitempty"` + // the time when it started + StartedAt *metav1.Time `json:"startedAt,omitempty"` + // a list of conditions occurred during the build + Conditions []BuildConditionApplyConfiguration `json:"conditions,omitempty"` + // how long it took for the build + // Change to Duration / ISO 8601 when CRD uses OpenAPI spec v3 + // https://github.com/OAI/OpenAPI-Specification/issues/845 + Duration *string `json:"duration,omitempty"` } // BuildStatusApplyConfiguration constructs a declarative configuration of the BuildStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelartifact.go b/pkg/client/camel/applyconfiguration/camel/v1/camelartifact.go index 32bd46208d..1b73df30dc 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelartifact.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelartifact.go @@ -21,13 +21,21 @@ package v1 // CamelArtifactApplyConfiguration represents a declarative configuration of the CamelArtifact type for use // with apply. +// +// CamelArtifact represent the configuration for a feature offered by Camel. type CamelArtifactApplyConfiguration struct { + // Base Camel Artifact dependency CamelArtifactDependencyApplyConfiguration `json:",inline"` - Schemes []CamelSchemeApplyConfiguration `json:"schemes,omitempty"` - Languages []string `json:"languages,omitempty"` - DataFormats []string `json:"dataformats,omitempty"` - Dependencies []CamelArtifactDependencyApplyConfiguration `json:"dependencies,omitempty"` - JavaTypes []string `json:"javaTypes,omitempty"` + // accepted URI schemes + Schemes []CamelSchemeApplyConfiguration `json:"schemes,omitempty"` + // accepted languages + Languages []string `json:"languages,omitempty"` + // accepted data formats + DataFormats []string `json:"dataformats,omitempty"` + // required dependencies + Dependencies []CamelArtifactDependencyApplyConfiguration `json:"dependencies,omitempty"` + // the Java types used by the artifact feature (ie, component, data format, ...) + JavaTypes []string `json:"javaTypes,omitempty"` } // CamelArtifactApplyConfiguration constructs a declarative configuration of the CamelArtifact type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelartifactdependency.go b/pkg/client/camel/applyconfiguration/camel/v1/camelartifactdependency.go index 9a6b7cfd99..90ba216cca 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelartifactdependency.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelartifactdependency.go @@ -21,9 +21,13 @@ package v1 // CamelArtifactDependencyApplyConfiguration represents a declarative configuration of the CamelArtifactDependency type for use // with apply. +// +// CamelArtifactDependency represent a maven's dependency. type CamelArtifactDependencyApplyConfiguration struct { + // the maven dependency MavenArtifactApplyConfiguration `json:",inline"` - Exclusions []CamelArtifactExclusionApplyConfiguration `json:"exclusions,omitempty"` + // provide a list of artifacts to exclude for this dependency + Exclusions []CamelArtifactExclusionApplyConfiguration `json:"exclusions,omitempty"` } // CamelArtifactDependencyApplyConfiguration constructs a declarative configuration of the CamelArtifactDependency type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelartifactexclusion.go b/pkg/client/camel/applyconfiguration/camel/v1/camelartifactexclusion.go index ad21a36d48..6415fa39c8 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelartifactexclusion.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelartifactexclusion.go @@ -21,8 +21,12 @@ package v1 // CamelArtifactExclusionApplyConfiguration represents a declarative configuration of the CamelArtifactExclusion type for use // with apply. +// +// CamelArtifactExclusion represents an exclusion clause. type CamelArtifactExclusionApplyConfiguration struct { - GroupID *string `json:"groupId,omitempty"` + // Maven Group + GroupID *string `json:"groupId,omitempty"` + // Maven Artifact ArtifactID *string `json:"artifactId,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalog.go b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalog.go index c27a0259bf..a5b187149c 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalog.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalog.go @@ -27,11 +27,15 @@ import ( // CamelCatalogApplyConfiguration represents a declarative configuration of the CamelCatalog type for use // with apply. +// +// CamelCatalog represents the languages, components, data formats and capabilities enabled on a given runtime provider. The catalog may be statically generated. type CamelCatalogApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Status *CamelCatalogStatusApplyConfiguration `json:"status,omitempty"` - Spec *CamelCatalogSpecApplyConfiguration `json:"spec,omitempty"` + // the actual state of the catalog + Status *CamelCatalogStatusApplyConfiguration `json:"status,omitempty"` + // the desired state of the catalog + Spec *CamelCatalogSpecApplyConfiguration `json:"spec,omitempty"` } // CamelCatalog constructs a declarative configuration of the CamelCatalog type for use with @@ -44,6 +48,7 @@ func CamelCatalog(name, namespace string) *CamelCatalogApplyConfiguration { b.WithAPIVersion("camel.apache.org/v1") return b } + func (b CamelCatalogApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go index 7d61f2bace..07741588c9 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go @@ -27,13 +27,21 @@ import ( // CamelCatalogConditionApplyConfiguration represents a declarative configuration of the CamelCatalogCondition type for use // with apply. +// +// CamelCatalogCondition describes the state of a resource at a certain point. type CamelCatalogConditionApplyConfiguration struct { - Type *camelv1.CamelCatalogConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + // Type of CamelCatalog condition. + Type *camelv1.CamelCatalogConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` } // CamelCatalogConditionApplyConfiguration constructs a declarative configuration of the CamelCatalogCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogspec.go b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogspec.go index 33c2db3428..2a8a554938 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogspec.go @@ -21,10 +21,15 @@ package v1 // CamelCatalogSpecApplyConfiguration represents a declarative configuration of the CamelCatalogSpec type for use // with apply. +// +// CamelCatalogSpec specify what features a Camel runtime provides. type CamelCatalogSpecApplyConfiguration struct { - Runtime *RuntimeSpecApplyConfiguration `json:"runtime,omitempty"` + // the runtime targeted for the catalog + Runtime *RuntimeSpecApplyConfiguration `json:"runtime,omitempty"` + // artifacts required by this catalog Artifacts map[string]CamelArtifactApplyConfiguration `json:"artifacts,omitempty"` - Loaders map[string]CamelLoaderApplyConfiguration `json:"loaders,omitempty"` + // loaders required by this catalog + Loaders map[string]CamelLoaderApplyConfiguration `json:"loaders,omitempty"` } // CamelCatalogSpecApplyConfiguration constructs a declarative configuration of the CamelCatalogSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go index cc5c2d5c5a..7ffb454138 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go @@ -25,11 +25,17 @@ import ( // CamelCatalogStatusApplyConfiguration represents a declarative configuration of the CamelCatalogStatus type for use // with apply. +// +// CamelCatalogStatus defines the observed state of CamelCatalog. type CamelCatalogStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.CamelCatalogPhase `json:"phase,omitempty"` - Conditions []CamelCatalogConditionApplyConfiguration `json:"conditions,omitempty"` - Image *string `json:"image,omitempty"` + // ObservedGeneration is the most recent generation observed for this Catalog. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // the actual phase + Phase *camelv1.CamelCatalogPhase `json:"phase,omitempty"` + // a list of events happened for the CamelCatalog + Conditions []CamelCatalogConditionApplyConfiguration `json:"conditions,omitempty"` + // the container image available for building an application with this catalog + Image *string `json:"image,omitempty"` } // CamelCatalogStatusApplyConfiguration constructs a declarative configuration of the CamelCatalogStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelloader.go b/pkg/client/camel/applyconfiguration/camel/v1/camelloader.go index 1e259645b7..7eae69e90d 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelloader.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelloader.go @@ -21,11 +21,17 @@ package v1 // CamelLoaderApplyConfiguration represents a declarative configuration of the CamelLoader type for use // with apply. +// +// CamelLoader represents the configuration required to load a DSL. type CamelLoaderApplyConfiguration struct { + // the base Maven artifact required MavenArtifactApplyConfiguration `json:",inline"` - Languages []string `json:"languages,omitempty"` - Dependencies []MavenArtifactApplyConfiguration `json:"dependencies,omitempty"` - Metadata map[string]string `json:"metadata,omitempty"` + // a list of DSLs supported + Languages []string `json:"languages,omitempty"` + // a list of additional dependencies required beside the base one + Dependencies []MavenArtifactApplyConfiguration `json:"dependencies,omitempty"` + // the metadata of the loader + Metadata map[string]string `json:"metadata,omitempty"` } // CamelLoaderApplyConfiguration constructs a declarative configuration of the CamelLoader type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelproperty.go b/pkg/client/camel/applyconfiguration/camel/v1/camelproperty.go index 13d673f6fc..b8d9411f2f 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelproperty.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelproperty.go @@ -21,6 +21,8 @@ package v1 // CamelPropertyApplyConfiguration represents a declarative configuration of the CamelProperty type for use // with apply. +// +// CamelProperty represents a Camel property that may end up in an application.properties file. type CamelPropertyApplyConfiguration struct { Key *string `json:"key,omitempty"` Value *string `json:"value,omitempty"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelscheme.go b/pkg/client/camel/applyconfiguration/camel/v1/camelscheme.go index 447275f0a2..2c79b3ea32 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelscheme.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelscheme.go @@ -21,11 +21,18 @@ package v1 // CamelSchemeApplyConfiguration represents a declarative configuration of the CamelScheme type for use // with apply. +// +// CamelScheme represents the scheme used to identify a component in a URI (ie, timer in a timer:xyz endpoint URI). type CamelSchemeApplyConfiguration struct { - ID *string `json:"id,omitempty"` - Passive *bool `json:"passive,omitempty"` - HTTP *bool `json:"http,omitempty"` + // the ID (ie, timer in a timer:xyz URI) + ID *string `json:"id,omitempty"` + // is a passive scheme + Passive *bool `json:"passive,omitempty"` + // is a HTTP based scheme + HTTP *bool `json:"http,omitempty"` + // required scope for consumer Consumer *CamelSchemeScopeApplyConfiguration `json:"consumer,omitempty"` + // required scope for producers Producer *CamelSchemeScopeApplyConfiguration `json:"producer,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelschemescope.go b/pkg/client/camel/applyconfiguration/camel/v1/camelschemescope.go index ef4b8a48c6..2632b4b8f5 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/camelschemescope.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/camelschemescope.go @@ -21,7 +21,10 @@ package v1 // CamelSchemeScopeApplyConfiguration represents a declarative configuration of the CamelSchemeScope type for use // with apply. +// +// CamelSchemeScope contains scoped information about a scheme. type CamelSchemeScopeApplyConfiguration struct { + // list of dependencies needed for this scope Dependencies []CamelArtifactDependencyApplyConfiguration `json:"dependencies,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/capability.go b/pkg/client/camel/applyconfiguration/camel/v1/capability.go index dd722c0cd1..ffacaf9a57 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/capability.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/capability.go @@ -21,11 +21,18 @@ package v1 // CapabilityApplyConfiguration represents a declarative configuration of the Capability type for use // with apply. +// +// Capability is a particular feature which requires a well known set of dependencies and other properties +// which are specified in the runtime catalog. type CapabilityApplyConfiguration struct { - Dependencies []MavenArtifactApplyConfiguration `json:"dependencies,omitempty"` - RuntimeProperties []CamelPropertyApplyConfiguration `json:"runtimeProperties,omitempty"` + // List of required Maven dependencies + Dependencies []MavenArtifactApplyConfiguration `json:"dependencies,omitempty"` + // Set of required Camel runtime properties + RuntimeProperties []CamelPropertyApplyConfiguration `json:"runtimeProperties,omitempty"` + // Set of required Camel build time properties BuildTimeProperties []CamelPropertyApplyConfiguration `json:"buildTimeProperties,omitempty"` - Metadata map[string]string `json:"metadata,omitempty"` + // Set of generic metadata + Metadata map[string]string `json:"metadata,omitempty"` } // CapabilityApplyConfiguration constructs a declarative configuration of the Capability type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/catalog.go b/pkg/client/camel/applyconfiguration/camel/v1/catalog.go index e7927ac38a..c9e556d936 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/catalog.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/catalog.go @@ -25,6 +25,8 @@ import ( // CatalogApplyConfiguration represents a declarative configuration of the Catalog type for use // with apply. +// +// Catalog represents the Camel Catalog runtime specification. type CatalogApplyConfiguration struct { Version *string `json:"version,omitempty"` Provider *camelv1.RuntimeProvider `json:"provider,omitempty"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/configurationspec.go b/pkg/client/camel/applyconfiguration/camel/v1/configurationspec.go index 7bbaa99e53..9a3987c306 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/configurationspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/configurationspec.go @@ -21,8 +21,12 @@ package v1 // ConfigurationSpecApplyConfiguration represents a declarative configuration of the ConfigurationSpec type for use // with apply. +// +// ConfigurationSpec represents a generic configuration specification. type ConfigurationSpecApplyConfiguration struct { - Type *string `json:"type,omitempty"` + // represents the type of configuration, ie: property, configmap, secret, ... + Type *string `json:"type,omitempty"` + // the value to assign to the configuration (syntax may vary depending on the `Type`) Value *string `json:"value,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/dataspec.go b/pkg/client/camel/applyconfiguration/camel/v1/dataspec.go index c54aee63e2..aa5cd88a20 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/dataspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/dataspec.go @@ -21,15 +21,25 @@ package v1 // DataSpecApplyConfiguration represents a declarative configuration of the DataSpec type for use // with apply. +// +// DataSpec represents the way the source is materialized in the running `Pod`. type DataSpecApplyConfiguration struct { - Name *string `json:"name,omitempty"` - Path *string `json:"path,omitempty"` - Content *string `json:"content,omitempty"` - RawContent []byte `json:"rawContent,omitempty"` - ContentRef *string `json:"contentRef,omitempty"` - ContentKey *string `json:"contentKey,omitempty"` + // the name of the specification + Name *string `json:"name,omitempty"` + // the path where the file is stored + Path *string `json:"path,omitempty"` + // the source code (plain text) + Content *string `json:"content,omitempty"` + // the source code (binary) + RawContent []byte `json:"rawContent,omitempty"` + // the confimap reference holding the source content + ContentRef *string `json:"contentRef,omitempty"` + // the confimap key holding the source content + ContentKey *string `json:"contentKey,omitempty"` + // the content type (tipically text or binary) ContentType *string `json:"contentType,omitempty"` - Compression *bool `json:"compression,omitempty"` + // if the content is compressed (base64 encrypted) + Compression *bool `json:"compression,omitempty"` } // DataSpecApplyConfiguration constructs a declarative configuration of the DataSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go b/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go index b4ee27b6db..2f0dd003a4 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go @@ -21,8 +21,12 @@ package v1 // DataTypeReferenceApplyConfiguration represents a declarative configuration of the DataTypeReference type for use // with apply. +// +// DataTypeReference references to the specification of a data type by its scheme and format name. type DataTypeReferenceApplyConfiguration struct { + // the data type component scheme Scheme *string `json:"scheme,omitempty"` + // the data type format name Format *string `json:"format,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go b/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go index c0e923bb13..71270e4186 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go @@ -21,14 +21,23 @@ package v1 // DataTypeSpecApplyConfiguration represents a declarative configuration of the DataTypeSpec type for use // with apply. +// +// DataTypeSpec represents the specification for a data type. type DataTypeSpecApplyConfiguration struct { - Scheme *string `json:"scheme,omitempty"` - Format *string `json:"format,omitempty"` - Description *string `json:"description,omitempty"` - MediaType *string `json:"mediaType,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Headers map[string]HeaderSpecApplyConfiguration `json:"headers,omitempty"` - Schema *JSONSchemaPropsApplyConfiguration `json:"schema,omitempty"` + // the data type component scheme + Scheme *string `json:"scheme,omitempty"` + // the data type format name + Format *string `json:"format,omitempty"` + // optional description + Description *string `json:"description,omitempty"` + // media type as expected for HTTP media types (ie, application/json) + MediaType *string `json:"mediaType,omitempty"` + // the list of Camel or Maven dependencies required by the data type + Dependencies []string `json:"dependencies,omitempty"` + // one to many header specifications + Headers map[string]HeaderSpecApplyConfiguration `json:"headers,omitempty"` + // the expected schema for the data type + Schema *JSONSchemaPropsApplyConfiguration `json:"schema,omitempty"` } // DataTypeSpecApplyConfiguration constructs a declarative configuration of the DataTypeSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/datatypesspec.go b/pkg/client/camel/applyconfiguration/camel/v1/datatypesspec.go index 5932fe2891..52669c5043 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/datatypesspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/datatypesspec.go @@ -21,10 +21,15 @@ package v1 // DataTypesSpecApplyConfiguration represents a declarative configuration of the DataTypesSpec type for use // with apply. +// +// DataTypesSpec represents the specification for a set of data types. type DataTypesSpecApplyConfiguration struct { - Default *string `json:"default,omitempty"` - Types map[string]DataTypeSpecApplyConfiguration `json:"types,omitempty"` - Headers map[string]HeaderSpecApplyConfiguration `json:"headers,omitempty"` + // the default data type for this Kamelet + Default *string `json:"default,omitempty"` + // one to many data type specifications + Types map[string]DataTypeSpecApplyConfiguration `json:"types,omitempty"` + // one to many header specifications + Headers map[string]HeaderSpecApplyConfiguration `json:"headers,omitempty"` } // DataTypesSpecApplyConfiguration constructs a declarative configuration of the DataTypesSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/endpoint.go b/pkg/client/camel/applyconfiguration/camel/v1/endpoint.go index dbebe5a496..58dfb3288f 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/endpoint.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/endpoint.go @@ -26,11 +26,17 @@ import ( // EndpointApplyConfiguration represents a declarative configuration of the Endpoint type for use // with apply. +// +// Endpoint represents a source/sink external entity (could be any Kubernetes resource or Camel URI). type EndpointApplyConfiguration struct { - Ref *corev1.ObjectReference `json:"ref,omitempty"` - URI *string `json:"uri,omitempty"` - Properties *EndpointPropertiesApplyConfiguration `json:"properties,omitempty"` - DataTypes map[camelv1.TypeSlot]DataTypeReferenceApplyConfiguration `json:"dataTypes,omitempty"` + // Ref can be used to declare a Kubernetes resource as source/sink endpoint + Ref *corev1.ObjectReference `json:"ref,omitempty"` + // URI can be used to specify the (Camel) endpoint explicitly + URI *string `json:"uri,omitempty"` + // Properties are a key value representation of endpoint properties + Properties *EndpointPropertiesApplyConfiguration `json:"properties,omitempty"` + // DataTypes defines the data type of the data produced/consumed by the endpoint and references a given data type specification. + DataTypes map[camelv1.TypeSlot]DataTypeReferenceApplyConfiguration `json:"dataTypes,omitempty"` } // EndpointApplyConfiguration constructs a declarative configuration of the Endpoint type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/endpointproperties.go b/pkg/client/camel/applyconfiguration/camel/v1/endpointproperties.go index ffc2f09bca..a27c826383 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/endpointproperties.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/endpointproperties.go @@ -25,6 +25,8 @@ import ( // EndpointPropertiesApplyConfiguration represents a declarative configuration of the EndpointProperties type for use // with apply. +// +// EndpointProperties is a key/value struct represented as JSON raw to allow numeric/boolean values. type EndpointPropertiesApplyConfiguration struct { camelv1.RawMessage `json:",inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/errorhandlerspec.go b/pkg/client/camel/applyconfiguration/camel/v1/errorhandlerspec.go index 6ab0062899..5fa5b6a79f 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/errorhandlerspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/errorhandlerspec.go @@ -25,6 +25,8 @@ import ( // ErrorHandlerSpecApplyConfiguration represents a declarative configuration of the ErrorHandlerSpec type for use // with apply. +// +// ErrorHandlerSpec represents an unstructured object for an error handler. type ErrorHandlerSpecApplyConfiguration struct { camelv1.RawMessage `json:",omitempty,inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/eventtypespec.go b/pkg/client/camel/applyconfiguration/camel/v1/eventtypespec.go index 2e00b16f5e..6870a95dea 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/eventtypespec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/eventtypespec.go @@ -21,9 +21,14 @@ package v1 // EventTypeSpecApplyConfiguration represents a declarative configuration of the EventTypeSpec type for use // with apply. +// +// EventTypeSpec represents a specification for an event type. +// Deprecated: In favor of using DataTypeSpec. type EventTypeSpecApplyConfiguration struct { - MediaType *string `json:"mediaType,omitempty"` - Schema *JSONSchemaPropsApplyConfiguration `json:"schema,omitempty"` + // media type as expected for HTTP media types (ie, application/json) + MediaType *string `json:"mediaType,omitempty"` + // the expected schema for the event + Schema *JSONSchemaPropsApplyConfiguration `json:"schema,omitempty"` } // EventTypeSpecApplyConfiguration constructs a declarative configuration of the EventTypeSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/externaldocumentation.go b/pkg/client/camel/applyconfiguration/camel/v1/externaldocumentation.go index 2690404875..923dc47d10 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/externaldocumentation.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/externaldocumentation.go @@ -21,6 +21,8 @@ package v1 // ExternalDocumentationApplyConfiguration represents a declarative configuration of the ExternalDocumentation type for use // with apply. +// +// ExternalDocumentation allows referencing an external resource for extended documentation. type ExternalDocumentationApplyConfiguration struct { Description *string `json:"description,omitempty"` URL *string `json:"url,omitempty"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/failure.go b/pkg/client/camel/applyconfiguration/camel/v1/failure.go index 0af66fd481..163cf8ad9c 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/failure.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/failure.go @@ -25,9 +25,14 @@ import ( // FailureApplyConfiguration represents a declarative configuration of the Failure type for use // with apply. +// +// Failure represent a message specifying the reason and the time of an event failure. type FailureApplyConfiguration struct { - Reason *string `json:"reason,omitempty"` - Time *metav1.Time `json:"time,omitempty"` + // a short text specifying the reason + Reason *string `json:"reason,omitempty"` + // the time when the failure has happened + Time *metav1.Time `json:"time,omitempty"` + // the recovery attempted for this failure Recovery *FailureRecoveryApplyConfiguration `json:"recovery,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/failurerecovery.go b/pkg/client/camel/applyconfiguration/camel/v1/failurerecovery.go index fe3427e0d3..3afd415bec 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/failurerecovery.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/failurerecovery.go @@ -25,9 +25,14 @@ import ( // FailureRecoveryApplyConfiguration represents a declarative configuration of the FailureRecovery type for use // with apply. +// +// FailureRecovery defines the attempts to recover a failure. type FailureRecoveryApplyConfiguration struct { - Attempt *int `json:"attempt,omitempty"` - AttemptMax *int `json:"attemptMax,omitempty"` + // attempt number + Attempt *int `json:"attempt,omitempty"` + // maximum number of attempts + AttemptMax *int `json:"attemptMax,omitempty"` + // time of the attempt execution AttemptTime *metav1.Time `json:"attemptTime,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/flow.go b/pkg/client/camel/applyconfiguration/camel/v1/flow.go index 9b7d44f023..c01cdfa82a 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/flow.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/flow.go @@ -25,6 +25,8 @@ import ( // FlowApplyConfiguration represents a declarative configuration of the Flow type for use // with apply. +// +// Flow is an unstructured object representing a Camel Flow in YAML/JSON DSL. type FlowApplyConfiguration struct { camelv1.RawMessage `json:",inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/gitconfigspec.go b/pkg/client/camel/applyconfiguration/camel/v1/gitconfigspec.go index 2f56e43276..d40e2ce83f 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/gitconfigspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/gitconfigspec.go @@ -21,11 +21,18 @@ package v1 // GitConfigSpecApplyConfiguration represents a declarative configuration of the GitConfigSpec type for use // with apply. +// +// GitConfigSpec defines the Git configuration of a project. type GitConfigSpecApplyConfiguration struct { - URL *string `json:"url,omitempty"` + // the URL of the project + URL *string `json:"url,omitempty"` + // the Kubernetes secret where token is stored Secret *string `json:"secret,omitempty"` + // the git branch to check out Branch *string `json:"branch,omitempty"` - Tag *string `json:"tag,omitempty"` + // the git tag to check out + Tag *string `json:"tag,omitempty"` + // the git commit (full SHA) to check out Commit *string `json:"commit,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/headerspec.go b/pkg/client/camel/applyconfiguration/camel/v1/headerspec.go index bca3f5e0fd..a480c2c897 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/headerspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/headerspec.go @@ -21,6 +21,8 @@ package v1 // HeaderSpecApplyConfiguration represents a declarative configuration of the HeaderSpec type for use // with apply. +// +// HeaderSpec represents the specification for a header used in the Kamelet. type HeaderSpecApplyConfiguration struct { Type *string `json:"type,omitempty"` Title *string `json:"title,omitempty"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integration.go b/pkg/client/camel/applyconfiguration/camel/v1/integration.go index 312c4baf3d..dcf34d1898 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integration.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integration.go @@ -27,11 +27,15 @@ import ( // IntegrationApplyConfiguration represents a declarative configuration of the Integration type for use // with apply. +// +// Integration is the Schema for the integrations API. type IntegrationApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *IntegrationSpecApplyConfiguration `json:"spec,omitempty"` - Status *IntegrationStatusApplyConfiguration `json:"status,omitempty"` + // the desired Integration specification + Spec *IntegrationSpecApplyConfiguration `json:"spec,omitempty"` + // the status of the Integration + Status *IntegrationStatusApplyConfiguration `json:"status,omitempty"` } // Integration constructs a declarative configuration of the Integration type for use with @@ -44,6 +48,7 @@ func Integration(name, namespace string) *IntegrationApplyConfiguration { b.WithAPIVersion("camel.apache.org/v1") return b } + func (b IntegrationApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go index 0b5343c60c..dfcde654d5 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go @@ -27,15 +27,25 @@ import ( // IntegrationConditionApplyConfiguration represents a declarative configuration of the IntegrationCondition type for use // with apply. +// +// IntegrationCondition describes the state of a resource at a certain point. type IntegrationConditionApplyConfiguration struct { - Type *camelv1.IntegrationConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - FirstTruthyTime *metav1.Time `json:"firstTruthyTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` - Pods []PodConditionApplyConfiguration `json:"pods,omitempty"` + // Type of integration condition. + Type *camelv1.IntegrationConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // First time the condition status transitioned to True. + FirstTruthyTime *metav1.Time `json:"firstTruthyTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` + // Pods collect health and conditions information from the owned PODs + Pods []PodConditionApplyConfiguration `json:"pods,omitempty"` } // IntegrationConditionApplyConfiguration constructs a declarative configuration of the IntegrationCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkit.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkit.go index 7b7fc737d0..3973432b35 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkit.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkit.go @@ -27,11 +27,18 @@ import ( // IntegrationKitApplyConfiguration represents a declarative configuration of the IntegrationKit type for use // with apply. +// +// IntegrationKit defines a container image and additional configuration needed to run an `Integration`. +// An `IntegrationKit` is a generic image generally built from the requirements of an `Integration`, but agnostic to it, +// in order to be reused by any other `Integration` which has the same required set of capabilities. An `IntegrationKit` +// may be used for other kits as a base container layer, when the `incremental` build option is enabled. type IntegrationKitApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *IntegrationKitSpecApplyConfiguration `json:"spec,omitempty"` - Status *IntegrationKitStatusApplyConfiguration `json:"status,omitempty"` + // the desired configuration + Spec *IntegrationKitSpecApplyConfiguration `json:"spec,omitempty"` + // the actual status + Status *IntegrationKitStatusApplyConfiguration `json:"status,omitempty"` } // IntegrationKit constructs a declarative configuration of the IntegrationKit type for use with @@ -44,6 +51,7 @@ func IntegrationKit(name, namespace string) *IntegrationKitApplyConfiguration { b.WithAPIVersion("camel.apache.org/v1") return b } + func (b IntegrationKitApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go index 00052075ce..6ef229bfc0 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go @@ -27,13 +27,21 @@ import ( // IntegrationKitConditionApplyConfiguration represents a declarative configuration of the IntegrationKitCondition type for use // with apply. +// +// IntegrationKitCondition describes the state of a resource at a certain point. type IntegrationKitConditionApplyConfiguration struct { - Type *camelv1.IntegrationKitConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + // Type of integration condition. + Type *camelv1.IntegrationKitConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` } // IntegrationKitConditionApplyConfiguration constructs a declarative configuration of the IntegrationKitCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go index ad35ae00a6..5da7cf1351 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go @@ -25,15 +25,31 @@ import ( // IntegrationKitSpecApplyConfiguration represents a declarative configuration of the IntegrationKitSpec type for use // with apply. +// +// IntegrationKitSpec defines a container image and additional configurations required to kick off an `Integration` with certain features. type IntegrationKitSpecApplyConfiguration struct { - Image *string `json:"image,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Profile *camelv1.TraitProfile `json:"profile,omitempty"` - Traits *IntegrationKitTraitsApplyConfiguration `json:"traits,omitempty"` - Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` - Repositories []string `json:"repositories,omitempty"` - Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` - Capabilities []string `json:"capabilities,omitempty"` + // the container image as identified in the container registry + Image *string `json:"image,omitempty"` + // a list of Camel dependencies used by this kit + Dependencies []string `json:"dependencies,omitempty"` + // the profile which is expected by this kit + Profile *camelv1.TraitProfile `json:"profile,omitempty"` + // traits that the kit will execute + Traits *IntegrationKitTraitsApplyConfiguration `json:"traits,omitempty"` + // Deprecated: + // + // Use camel trait (camel.properties) to manage properties + // Use mount trait (mount.configs) to manage configs + // Use mount trait (mount.resources) to manage resources + // Use mount trait (mount.volumes) to manage volumes + // configuration used by the kit + Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` + // Maven repositories that can be used by the kit + Repositories []string `json:"repositories,omitempty"` + // the sources to add at build time + Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` + // features offered by the IntegrationKit + Capabilities []string `json:"capabilities,omitempty"` } // IntegrationKitSpecApplyConfiguration constructs a declarative configuration of the IntegrationKitSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go index a8f0be6070..f8ad3c57e0 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go @@ -25,21 +25,37 @@ import ( // IntegrationKitStatusApplyConfiguration represents a declarative configuration of the IntegrationKitStatus type for use // with apply. +// +// IntegrationKitStatus defines the observed state of IntegrationKit. type IntegrationKitStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.IntegrationKitPhase `json:"phase,omitempty"` - RootImage *string `json:"rootImage,omitempty"` - BaseImage *string `json:"baseImage,omitempty"` - Image *string `json:"image,omitempty"` - Digest *string `json:"digest,omitempty"` - Artifacts []ArtifactApplyConfiguration `json:"artifacts,omitempty"` - Failure *FailureApplyConfiguration `json:"failure,omitempty"` - RuntimeVersion *string `json:"runtimeVersion,omitempty"` - RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` - Catalog *CatalogApplyConfiguration `json:"catalog,omitempty"` - Platform *string `json:"platform,omitempty"` - Version *string `json:"version,omitempty"` - Conditions []IntegrationKitConditionApplyConfiguration `json:"conditions,omitempty"` + // ObservedGeneration is the most recent generation observed for this IntegrationKit. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // phase of the kit + Phase *camelv1.IntegrationKitPhase `json:"phase,omitempty"` + // root image used by the kit (the first image from which the incremental image has started, typically a JDK/JRE base image) + RootImage *string `json:"rootImage,omitempty"` + // base image used by the kit (could be another IntegrationKit) + BaseImage *string `json:"baseImage,omitempty"` + // actual image name of the kit + Image *string `json:"image,omitempty"` + // actual image digest of the kit + Digest *string `json:"digest,omitempty"` + // list of artifacts used by the kit + Artifacts []ArtifactApplyConfiguration `json:"artifacts,omitempty"` + // failure reason (if any) + Failure *FailureApplyConfiguration `json:"failure,omitempty"` + // the runtime version for which this kit was configured + RuntimeVersion *string `json:"runtimeVersion,omitempty"` + // the runtime provider for which this kit was configured + RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` + // the catalog used to build/operate the IntegrationKit. + Catalog *CatalogApplyConfiguration `json:"catalog,omitempty"` + // the platform for which this kit was configured + Platform *string `json:"platform,omitempty"` + // the Camel K operator version for which this kit was configured + Version *string `json:"version,omitempty"` + // a list of conditions which happened for the events related the kit + Conditions []IntegrationKitConditionApplyConfiguration `json:"conditions,omitempty"` } // IntegrationKitStatusApplyConfiguration constructs a declarative configuration of the IntegrationKitStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go index 3ea8ec0e3d..20ac2f022a 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go @@ -25,12 +25,23 @@ import ( // IntegrationKitTraitsApplyConfiguration represents a declarative configuration of the IntegrationKitTraits type for use // with apply. +// +// IntegrationKitTraits defines traits assigned to an `IntegrationKit`. type IntegrationKitTraitsApplyConfiguration struct { - Builder *trait.BuilderTrait `json:"builder,omitempty"` - Camel *trait.CamelTrait `json:"camel,omitempty"` - Quarkus *trait.QuarkusTrait `json:"quarkus,omitempty"` - Registry *trait.RegistryTrait `json:"registry,omitempty"` - Addons map[string]AddonTraitApplyConfiguration `json:"addons,omitempty"` + // The builder trait is internally used to determine the best strategy to build and configure IntegrationKits. + Builder *trait.BuilderTrait `json:"builder,omitempty"` + // The Camel trait sets up Camel configuration. + Camel *trait.CamelTrait `json:"camel,omitempty"` + // The Quarkus trait configures the Quarkus runtime. + // 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 `json:"quarkus,omitempty"` + // 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 `json:"registry,omitempty"` + // Deprecated: no longer in use. + Addons map[string]AddonTraitApplyConfiguration `json:"addons,omitempty"` } // IntegrationKitTraitsApplyConfiguration constructs a declarative configuration of the IntegrationKitTraits type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatform.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatform.go index a00f99b766..866258a2ce 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatform.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatform.go @@ -27,6 +27,11 @@ import ( // IntegrationPlatformApplyConfiguration represents a declarative configuration of the IntegrationPlatform type for use // with apply. +// +// IntegrationPlatform is the resource used to drive the Camel K operator behavior. +// It defines the behavior of all Custom Resources (`IntegrationKit`, `Integration`, `Kamelet`) in the given namespace. +// When the Camel K operator is installed in `global` mode, +// you will need to specify an `IntegrationPlatform` in each namespace where you want the Camel K operator to be executed. type IntegrationPlatformApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` @@ -44,6 +49,7 @@ func IntegrationPlatform(name, namespace string) *IntegrationPlatformApplyConfig b.WithAPIVersion("camel.apache.org/v1") return b } + func (b IntegrationPlatformApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go index 93d25e8650..f210aaaf29 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go @@ -26,19 +26,38 @@ import ( // IntegrationPlatformBuildSpecApplyConfiguration represents a declarative configuration of the IntegrationPlatformBuildSpec type for use // with apply. +// +// IntegrationPlatformBuildSpec contains platform related build information. +// This configuration can be used to tune the behavior of the Integration/IntegrationKit image builds. +// You can define the build strategy, the image registry to use and the Maven configuration to adopt. type IntegrationPlatformBuildSpecApplyConfiguration struct { - BuildConfiguration *BuildConfigurationApplyConfiguration `json:"buildConfiguration,omitempty"` - PublishStrategy *camelv1.IntegrationPlatformBuildPublishStrategy `json:"publishStrategy,omitempty"` - RuntimeVersion *string `json:"runtimeVersion,omitempty"` - RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` - RuntimeCoreVersion *string `json:"runtimeCoreVersion,omitempty"` - BaseImage *string `json:"baseImage,omitempty"` - Registry *RegistrySpecApplyConfiguration `json:"registry,omitempty"` - BuildCatalogToolTimeout *metav1.Duration `json:"buildCatalogToolTimeout,omitempty"` - Timeout *metav1.Duration `json:"timeout,omitempty"` - Maven *MavenSpecApplyConfiguration `json:"maven,omitempty"` - PublishStrategyOptions map[string]string `json:"PublishStrategyOptions,omitempty"` - MaxRunningBuilds *int32 `json:"maxRunningBuilds,omitempty"` + // the configuration required to build an Integration container image + BuildConfiguration *BuildConfigurationApplyConfiguration `json:"buildConfiguration,omitempty"` + // the strategy to adopt for publishing an Integration container image + PublishStrategy *camelv1.IntegrationPlatformBuildPublishStrategy `json:"publishStrategy,omitempty"` + // the Camel K Runtime dependency version + RuntimeVersion *string `json:"runtimeVersion,omitempty"` + // the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5) + RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` + // the Camel core version used by this IntegrationPlatform + RuntimeCoreVersion *string `json:"runtimeCoreVersion,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 software + BaseImage *string `json:"baseImage,omitempty"` + // the image registry used to push/pull Integration images + Registry *RegistrySpecApplyConfiguration `json:"registry,omitempty"` + // the timeout (in seconds) to use when creating the build tools container image. + // + // Deprecated: no longer in use + BuildCatalogToolTimeout *metav1.Duration `json:"buildCatalogToolTimeout,omitempty"` + // how much time to wait before time out the pipeline process + Timeout *metav1.Duration `json:"timeout,omitempty"` + // Maven configuration used to build the Camel/Camel-Quarkus applications + Maven *MavenSpecApplyConfiguration `json:"maven,omitempty"` + // Deprecated: no longer in use + PublishStrategyOptions map[string]string `json:"PublishStrategyOptions,omitempty"` + // the maximum amount of parallel running pipelines started by this operator instance + MaxRunningBuilds *int32 `json:"maxRunningBuilds,omitempty"` } // IntegrationPlatformBuildSpecApplyConfiguration constructs a declarative configuration of the IntegrationPlatformBuildSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go index 43fe2a6076..008ca596fa 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go @@ -27,13 +27,21 @@ import ( // IntegrationPlatformConditionApplyConfiguration represents a declarative configuration of the IntegrationPlatformCondition type for use // with apply. +// +// IntegrationPlatformCondition describes the state of a resource at a certain point. type IntegrationPlatformConditionApplyConfiguration struct { - Type *camelv1.IntegrationPlatformConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + // Type of integration condition. + Type *camelv1.IntegrationPlatformConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` } // IntegrationPlatformConditionApplyConfiguration constructs a declarative configuration of the IntegrationPlatformCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformkameletspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformkameletspec.go index b0625bfa3d..3c07c70752 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformkameletspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformkameletspec.go @@ -21,7 +21,12 @@ package v1 // IntegrationPlatformKameletSpecApplyConfiguration represents a declarative configuration of the IntegrationPlatformKameletSpec type for use // with apply. +// +// IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform. +// +// Deprecated: to be removed in future versions. type IntegrationPlatformKameletSpecApplyConfiguration struct { + // remote repository used to retrieve Kamelet catalog Repositories []KameletRepositorySpecApplyConfiguration `json:"repositories,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go index 3687af9fe6..180e97d1eb 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go @@ -25,13 +25,30 @@ import ( // IntegrationPlatformSpecApplyConfiguration represents a declarative configuration of the IntegrationPlatformSpec type for use // with apply. +// +// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. +// Important: Run "make generate-deepcopy" to regenerate code after modifying this file +// IntegrationPlatformSpec defines the desired state of IntegrationPlatform. type IntegrationPlatformSpecApplyConfiguration struct { - Cluster *camelv1.IntegrationPlatformCluster `json:"cluster,omitempty"` - Profile *camelv1.TraitProfile `json:"profile,omitempty"` - Build *IntegrationPlatformBuildSpecApplyConfiguration `json:"build,omitempty"` - Traits *TraitsApplyConfiguration `json:"traits,omitempty"` - Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` - Kamelet *IntegrationPlatformKameletSpecApplyConfiguration `json:"kamelet,omitempty"` + // what kind of cluster you're running (ie, plain Kubernetes or OpenShift) + Cluster *camelv1.IntegrationPlatformCluster `json:"cluster,omitempty"` + // the profile you wish to use. It will apply certain traits which are required by the specific profile chosen. + // It usually relates the Cluster with the optional definition of special profiles (ie, Knative) + Profile *camelv1.TraitProfile `json:"profile,omitempty"` + // specify how to build the Integration/IntegrationKits + Build *IntegrationPlatformBuildSpecApplyConfiguration `json:"build,omitempty"` + // list of traits to be executed for all the Integration/IntegrationKits built from this IntegrationPlatform + Traits *TraitsApplyConfiguration `json:"traits,omitempty"` + // Deprecated: + // + // Use camel trait (camel.properties) to manage properties + // Use mount trait (mount.configs) to manage configs + // Use mount trait (mount.resources) to manage resources + // Use mount trait (mount.volumes) to manage volumes + // list of configuration properties to be attached to all the Integration/IntegrationKits built from this IntegrationPlatform + Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` + // configuration to be executed to all Kamelets controlled by this IntegrationPlatform + Kamelet *IntegrationPlatformKameletSpecApplyConfiguration `json:"kamelet,omitempty"` } // IntegrationPlatformSpecApplyConfiguration constructs a declarative configuration of the IntegrationPlatformSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go index 472bd30890..b68a040746 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go @@ -25,13 +25,20 @@ import ( // IntegrationPlatformStatusApplyConfiguration represents a declarative configuration of the IntegrationPlatformStatus type for use // with apply. +// +// IntegrationPlatformStatus defines the observed state of IntegrationPlatform. type IntegrationPlatformStatusApplyConfiguration struct { IntegrationPlatformSpecApplyConfiguration `json:",inline"` - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.IntegrationPlatformPhase `json:"phase,omitempty"` - Conditions []IntegrationPlatformConditionApplyConfiguration `json:"conditions,omitempty"` - Version *string `json:"version,omitempty"` - Info map[string]string `json:"info,omitempty"` + // ObservedGeneration is the most recent generation observed for this IntegrationPlatform. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // defines in what phase the IntegrationPlatform is found + Phase *camelv1.IntegrationPlatformPhase `json:"phase,omitempty"` + // which are the conditions met (particularly useful when in ERROR phase) + Conditions []IntegrationPlatformConditionApplyConfiguration `json:"conditions,omitempty"` + // the Camel K operator version controlling this IntegrationPlatform + Version *string `json:"version,omitempty"` + // generic information related to the build of Camel K operator software + Info map[string]string `json:"info,omitempty"` } // IntegrationPlatformStatusApplyConfiguration constructs a declarative configuration of the IntegrationPlatformStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofile.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofile.go index 7fed229df1..088c384386 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofile.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofile.go @@ -27,11 +27,15 @@ import ( // IntegrationProfileApplyConfiguration represents a declarative configuration of the IntegrationProfile type for use // with apply. +// +// IntegrationProfile is the resource used to apply user defined settings to the Camel K operator behavior. +// It defines the behavior of all Custom Resources (`IntegrationKit`, `Integration`, `Kamelet`) in the given namespace. type IntegrationProfileApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *IntegrationProfileSpecApplyConfiguration `json:"spec,omitempty"` - Status *IntegrationProfileStatusApplyConfiguration `json:"status,omitempty"` + Spec *IntegrationProfileSpecApplyConfiguration `json:"spec,omitempty"` + // Deprecated: no longer in use. + Status *IntegrationProfileStatusApplyConfiguration `json:"status,omitempty"` } // IntegrationProfile constructs a declarative configuration of the IntegrationProfile type for use with @@ -44,6 +48,7 @@ func IntegrationProfile(name, namespace string) *IntegrationProfileApplyConfigur b.WithAPIVersion("camel.apache.org/v1") return b } + func (b IntegrationProfileApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilebuildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilebuildspec.go index ef6070d9c9..a4c695be58 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilebuildspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilebuildspec.go @@ -26,13 +26,23 @@ import ( // IntegrationProfileBuildSpecApplyConfiguration represents a declarative configuration of the IntegrationProfileBuildSpec type for use // with apply. +// +// IntegrationProfileBuildSpec contains profile related build information. +// This configuration can be used to tune the behavior of the Integration/IntegrationKit image builds. type IntegrationProfileBuildSpecApplyConfiguration struct { - RuntimeVersion *string `json:"runtimeVersion,omitempty"` - RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` - BaseImage *string `json:"baseImage,omitempty"` - Registry *RegistrySpecApplyConfiguration `json:"registry,omitempty"` - Timeout *metav1.Duration `json:"timeout,omitempty"` - Maven *MavenSpecApplyConfiguration `json:"maven,omitempty"` + // the Camel K Runtime dependency version + RuntimeVersion *string `json:"runtimeVersion,omitempty"` + // the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5) + RuntimeProvider *camelv1.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 software + BaseImage *string `json:"baseImage,omitempty"` + // the image registry used to push/pull Integration images + Registry *RegistrySpecApplyConfiguration `json:"registry,omitempty"` + // how much time to wait before time out the pipeline process + Timeout *metav1.Duration `json:"timeout,omitempty"` + // Maven configuration used to build the Camel/Camel-Quarkus applications + Maven *MavenSpecApplyConfiguration `json:"maven,omitempty"` } // IntegrationProfileBuildSpecApplyConfiguration constructs a declarative configuration of the IntegrationProfileBuildSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilecondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilecondition.go index 44da23238f..cb09cb2b9e 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilecondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilecondition.go @@ -27,13 +27,21 @@ import ( // IntegrationProfileConditionApplyConfiguration represents a declarative configuration of the IntegrationProfileCondition type for use // with apply. +// +// IntegrationProfileCondition describes the state of a resource at a certain point. type IntegrationProfileConditionApplyConfiguration struct { - Type *camelv1.IntegrationProfileConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + // Type of integration condition. + Type *camelv1.IntegrationProfileConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` } // IntegrationProfileConditionApplyConfiguration constructs a declarative configuration of the IntegrationProfileCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilekameletspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilekameletspec.go index 13752d344e..6fda1ca186 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilekameletspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilekameletspec.go @@ -21,7 +21,10 @@ package v1 // IntegrationProfileKameletSpecApplyConfiguration represents a declarative configuration of the IntegrationProfileKameletSpec type for use // with apply. +// +// IntegrationProfileKameletSpec define the behavior for all the Kamelets controller by the IntegrationProfile. type IntegrationProfileKameletSpecApplyConfiguration struct { + // remote repository used to retrieve Kamelet catalog Repositories []KameletRepositorySpecApplyConfiguration `json:"repositories,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilespec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilespec.go index d030efc08b..f8cfaeac77 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilespec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilespec.go @@ -21,9 +21,16 @@ package v1 // IntegrationProfileSpecApplyConfiguration represents a declarative configuration of the IntegrationProfileSpec type for use // with apply. +// +// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. +// Important: Run "make generate-deepcopy" to regenerate code after modifying this file +// IntegrationProfileSpec applies user defined settings to the IntegrationProfile. type IntegrationProfileSpecApplyConfiguration struct { - Build *IntegrationProfileBuildSpecApplyConfiguration `json:"build,omitempty"` - Traits *TraitsApplyConfiguration `json:"traits,omitempty"` + // specify how to build the Integration/IntegrationKits + Build *IntegrationProfileBuildSpecApplyConfiguration `json:"build,omitempty"` + // list of traits to be executed for all the Integration/IntegrationKits built from this IntegrationProfile + Traits *TraitsApplyConfiguration `json:"traits,omitempty"` + // configuration to be executed to all Kamelets controlled by this IntegrationProfile Kamelet *IntegrationProfileKameletSpecApplyConfiguration `json:"kamelet,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilestatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilestatus.go index b3ebd08597..8cf60cd845 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilestatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationprofilestatus.go @@ -25,11 +25,16 @@ import ( // IntegrationProfileStatusApplyConfiguration represents a declarative configuration of the IntegrationProfileStatus type for use // with apply. +// +// IntegrationProfileStatus defines the observed state of IntegrationProfile. type IntegrationProfileStatusApplyConfiguration struct { IntegrationProfileSpecApplyConfiguration `json:",inline"` - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.IntegrationProfilePhase `json:"phase,omitempty"` - Conditions []IntegrationProfileConditionApplyConfiguration `json:"conditions,omitempty"` + // ObservedGeneration is the most recent generation observed for this IntegrationProfile. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // defines in what phase the IntegrationProfile is found + Phase *camelv1.IntegrationProfilePhase `json:"phase,omitempty"` + // which are the conditions met (particularly useful when in ERROR phase) + Conditions []IntegrationProfileConditionApplyConfiguration `json:"conditions,omitempty"` } // IntegrationProfileStatusApplyConfiguration constructs a declarative configuration of the IntegrationProfileStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go index 45a6981455..b65a6a8f43 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go @@ -26,19 +26,41 @@ import ( // IntegrationSpecApplyConfiguration represents a declarative configuration of the IntegrationSpec type for use // with apply. +// +// IntegrationSpec specifies the configuration of an Integration. +// The Integration will be watched by the operator which will be in charge to run the related application, according to the configuration specified. type IntegrationSpecApplyConfiguration struct { - Replicas *int32 `json:"replicas,omitempty"` - Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` - Git *GitConfigSpecApplyConfiguration `json:"git,omitempty"` - Flows []FlowApplyConfiguration `json:"flows,omitempty"` - IntegrationKit *corev1.ObjectReference `json:"integrationKit,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Profile *camelv1.TraitProfile `json:"profile,omitempty"` - Traits *TraitsApplyConfiguration `json:"traits,omitempty"` - PodTemplate *PodSpecTemplateApplyConfiguration `json:"template,omitempty"` - Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` - Repositories []string `json:"repositories,omitempty"` - ServiceAccountName *string `json:"serviceAccountName,omitempty"` + // the number of `Pods` needed for the running Integration + Replicas *int32 `json:"replicas,omitempty"` + // the sources which contain the Camel routes to run + Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` + // the configuration of the project to build on Git + Git *GitConfigSpecApplyConfiguration `json:"git,omitempty"` + // a source in YAML DSL language which contain the routes to run + Flows []FlowApplyConfiguration `json:"flows,omitempty"` + // the reference of the `IntegrationKit` which is used for this Integration + IntegrationKit *corev1.ObjectReference `json:"integrationKit,omitempty"` + // the list of Camel or Maven dependencies required by the Integration + Dependencies []string `json:"dependencies,omitempty"` + // the profile needed to run this Integration + Profile *camelv1.TraitProfile `json:"profile,omitempty"` + // the traits needed to run this Integration + Traits *TraitsApplyConfiguration `json:"traits,omitempty"` + // Pod template customization. + // + // Deprecated: use container, init-containers or owner traits instead + PodTemplate *PodSpecTemplateApplyConfiguration `json:"template,omitempty"` + // Deprecated: + // + // Use camel trait (camel.properties) to manage properties + // Use mount trait (mount.configs) to manage configs + // Use mount trait (mount.resources) to manage resources + // Use mount trait (mount.volumes) to manage volumes + Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` + // additional Maven repositories to be used + Repositories []string `json:"repositories,omitempty"` + // custom SA to use for the Integration + ServiceAccountName *string `json:"serviceAccountName,omitempty"` } // IntegrationSpecApplyConfiguration constructs a declarative configuration of the IntegrationSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go index fe6cdff3ba..7358083bbf 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go @@ -27,29 +27,55 @@ import ( // IntegrationStatusApplyConfiguration represents a declarative configuration of the IntegrationStatus type for use // with apply. +// +// IntegrationStatus defines the observed state of Integration. type IntegrationStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.IntegrationPhase `json:"phase,omitempty"` - Digest *string `json:"digest,omitempty"` - Image *string `json:"image,omitempty"` - Jar *string `json:"jar,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` - Profile *camelv1.TraitProfile `json:"profile,omitempty"` - Traits *TraitsApplyConfiguration `json:"traits,omitempty"` - IntegrationKit *corev1.ObjectReference `json:"integrationKit,omitempty"` - Platform *string `json:"platform,omitempty"` - GeneratedSources []SourceSpecApplyConfiguration `json:"generatedSources,omitempty"` - RuntimeVersion *string `json:"runtimeVersion,omitempty"` - RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` - Catalog *CatalogApplyConfiguration `json:"catalog,omitempty"` - Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` - Conditions []IntegrationConditionApplyConfiguration `json:"conditions,omitempty"` - Version *string `json:"version,omitempty"` - Replicas *int32 `json:"replicas,omitempty"` - Selector *string `json:"selector,omitempty"` - Capabilities []string `json:"capabilities,omitempty"` - InitializationTimestamp *metav1.Time `json:"lastInitTimestamp,omitempty"` - DeploymentTimestamp *metav1.Time `json:"lastDeploymentTimestamp,omitempty"` + // ObservedGeneration is the most recent generation observed for this Integration. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // the actual phase + Phase *camelv1.IntegrationPhase `json:"phase,omitempty"` + // the digest calculated for this Integration + Digest *string `json:"digest,omitempty"` + // the container image used + Image *string `json:"image,omitempty"` + // the Java jar dependency to execute (if available) + Jar *string `json:"jar,omitempty"` + // a list of dependencies needed by the application + Dependencies []string `json:"dependencies,omitempty"` + // the profile needed to run this Integration + Profile *camelv1.TraitProfile `json:"profile,omitempty"` + // the traits executed for the Integration + Traits *TraitsApplyConfiguration `json:"traits,omitempty"` + // the reference of the `IntegrationKit` which is used for this Integration + IntegrationKit *corev1.ObjectReference `json:"integrationKit,omitempty"` + // The IntegrationPlatform watching this Integration + Platform *string `json:"platform,omitempty"` + // a list of sources generated for this Integration + GeneratedSources []SourceSpecApplyConfiguration `json:"generatedSources,omitempty"` + // the runtime version targeted for this Integration + RuntimeVersion *string `json:"runtimeVersion,omitempty"` + // the runtime provider targeted for this Integration + RuntimeProvider *camelv1.RuntimeProvider `json:"runtimeProvider,omitempty"` + // the catalog used to build/operate the Integration. + Catalog *CatalogApplyConfiguration `json:"catalog,omitempty"` + // a list of configuration specification. + // + // Deprecated: use properties instead. + Configuration []ConfigurationSpecApplyConfiguration `json:"configuration,omitempty"` + // a list of events happened for the Integration + Conditions []IntegrationConditionApplyConfiguration `json:"conditions,omitempty"` + // the operator version + Version *string `json:"version,omitempty"` + // the number of replicas + Replicas *int32 `json:"replicas,omitempty"` + // label selector + Selector *string `json:"selector,omitempty"` + // features offered by the Integration + Capabilities []string `json:"capabilities,omitempty"` + // the timestamp representing the last time when this integration was initialized. + InitializationTimestamp *metav1.Time `json:"lastInitTimestamp,omitempty"` + // the timestamp representing the last time when this integration was deployed. + DeploymentTimestamp *metav1.Time `json:"lastDeploymentTimestamp,omitempty"` } // IntegrationStatusApplyConfiguration constructs a declarative configuration of the IntegrationStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/jibtask.go b/pkg/client/camel/applyconfiguration/camel/v1/jibtask.go index 6e89999cdf..af8b449986 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/jibtask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/jibtask.go @@ -21,6 +21,8 @@ package v1 // JibTaskApplyConfiguration represents a declarative configuration of the JibTask type for use // with apply. +// +// JibTask is used to configure Jib. type JibTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` PublishTaskApplyConfiguration `json:",inline"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/json.go b/pkg/client/camel/applyconfiguration/camel/v1/json.go index 81b05448c8..c0baa3a42b 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/json.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/json.go @@ -25,6 +25,9 @@ import ( // JSONApplyConfiguration represents a declarative configuration of the JSON type for use // with apply. +// +// JSON represents any valid JSON value. +// These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil. type JSONApplyConfiguration struct { camelv1.RawMessage `json:",inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprop.go b/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprop.go index aae30c7e72..bc852850a9 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprop.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprop.go @@ -26,12 +26,39 @@ import ( // JSONSchemaPropApplyConfiguration represents a declarative configuration of the JSONSchemaProp type for use // with apply. type JSONSchemaPropApplyConfiguration struct { - ID *string `json:"id,omitempty"` - Deprecated *bool `json:"deprecated,omitempty"` - Description *string `json:"description,omitempty"` - Type *string `json:"type,omitempty"` - Format *string `json:"format,omitempty"` - Title *string `json:"title,omitempty"` + ID *string `json:"id,omitempty"` + Deprecated *bool `json:"deprecated,omitempty"` + Description *string `json:"description,omitempty"` + Type *string `json:"type,omitempty"` + // format is an OpenAPI v3 format string. Unknown formats are ignored. The following formats are validated: + // + // - bsonobjectid: a bson object ID, i.e. a 24 characters hex string + // - uri: an URI as parsed by Golang net/url.ParseRequestURI + // - email: an email address as parsed by Golang net/mail.ParseAddress + // - hostname: a valid representation for an Internet host name, as defined by RFC 1034, section 3.1 [RFC1034]. + // - ipv4: an IPv4 IP as parsed by Golang net.ParseIP + // - ipv6: an IPv6 IP as parsed by Golang net.ParseIP + // - cidr: a CIDR as parsed by Golang net.ParseCIDR + // - mac: a MAC address as parsed by Golang net.ParseMAC + // - uuid: an UUID that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + // - uuid3: an UUID3 that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$ + // - uuid4: an UUID4 that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + // - uuid5: an UUID5 that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$ + // - isbn: an ISBN10 or ISBN13 number string like "0321751043" or "978-0321751041" + // - isbn10: an ISBN10 number string like "0321751043" + // - isbn13: an ISBN13 number string like "978-0321751041" + // - creditcard: a credit card number defined by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\d{3})\\d{11})$ with any non digit characters mixed in + // - ssn: a U.S. social security number following the regex ^\\d{3}[- ]?\\d{2}[- ]?\\d{4}$ + // - hexcolor: an hexadecimal color code like "#FFFFFF" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ + // - rgbcolor: an RGB color code like rgb like "rgb(255,255,255)" + // - byte: base64 encoded binary data + // - password: any kind of string + // - date: a date string like "2006-01-02" as defined by full-date in RFC3339 + // - duration: a duration string like "22 ns" as parsed by Golang time.ParseDuration or compatible with Scala duration format + // - datetime: a date time string like "2014-12-15T19:30:20.000Z" as defined by date-time in RFC3339. + Format *string `json:"format,omitempty"` + Title *string `json:"title,omitempty"` + // default is a default value for undefined object fields. Default *JSONApplyConfiguration `json:"default,omitempty"` Maximum *json.Number `json:"maximum,omitempty"` ExclusiveMaximum *bool `json:"exclusiveMaximum,omitempty"` @@ -49,7 +76,8 @@ type JSONSchemaPropApplyConfiguration struct { Enum []JSONApplyConfiguration `json:"enum,omitempty"` Example *JSONApplyConfiguration `json:"example,omitempty"` Nullable *bool `json:"nullable,omitempty"` - XDescriptors []string `json:"x-descriptors,omitempty"` + // XDescriptors is a list of extended properties that trigger a custom behavior in external systems + XDescriptors []string `json:"x-descriptors,omitempty"` } // JSONSchemaPropApplyConfiguration constructs a declarative configuration of the JSONSchemaProp type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprops.go b/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprops.go index 52777fa7c9..19638cbe41 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprops.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/jsonschemaprops.go @@ -25,6 +25,8 @@ import ( // JSONSchemaPropsApplyConfiguration represents a declarative configuration of the JSONSchemaProps type for use // with apply. +// +// JSONSchemaProps is a JSON-Schema following Specification Draft 4 (http://json-schema.org/). type JSONSchemaPropsApplyConfiguration struct { ID *string `json:"id,omitempty"` Description *string `json:"description,omitempty"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kamelet.go b/pkg/client/camel/applyconfiguration/camel/v1/kamelet.go index d1c1608205..8a3dcda441 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kamelet.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kamelet.go @@ -27,11 +27,16 @@ import ( // KameletApplyConfiguration represents a declarative configuration of the Kamelet type for use // with apply. +// +// Kamelet is the Schema for the kamelets API. type KameletApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *KameletSpecApplyConfiguration `json:"spec,omitempty"` - Status *KameletStatusApplyConfiguration `json:"status,omitempty"` + // the desired specification + Spec *KameletSpecApplyConfiguration `json:"spec,omitempty"` + // the actual status of the resource + // Deprecated no longer in use + Status *KameletStatusApplyConfiguration `json:"status,omitempty"` } // Kamelet constructs a declarative configuration of the Kamelet type for use with @@ -44,6 +49,7 @@ func Kamelet(name, namespace string) *KameletApplyConfiguration { b.WithAPIVersion("camel.apache.org/v1") return b } + func (b KameletApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kameletcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/kameletcondition.go index 4a2bce979b..6783c3c193 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kameletcondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kameletcondition.go @@ -27,13 +27,21 @@ import ( // KameletConditionApplyConfiguration represents a declarative configuration of the KameletCondition type for use // with apply. +// +// KameletCondition describes the state of a resource at a certain point. type KameletConditionApplyConfiguration struct { - Type *camelv1.KameletConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + // Type of kamelet condition. + Type *camelv1.KameletConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human-readable message indicating details about the transition. + Message *string `json:"message,omitempty"` } // KameletConditionApplyConfiguration constructs a declarative configuration of the KameletCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kameletproperty.go b/pkg/client/camel/applyconfiguration/camel/v1/kameletproperty.go index 4014f1f887..56e0a99fa3 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kameletproperty.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kameletproperty.go @@ -21,8 +21,12 @@ package v1 // KameletPropertyApplyConfiguration represents a declarative configuration of the KameletProperty type for use // with apply. +// +// KameletProperty specify the behavior of a property in a Kamelet. type KameletPropertyApplyConfiguration struct { - Name *string `json:"name,omitempty"` + // the name of the property + Name *string `json:"name,omitempty"` + // the default value of the property (if any) Default *string `json:"default,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kameletrepositoryspec.go b/pkg/client/camel/applyconfiguration/camel/v1/kameletrepositoryspec.go index f2b298482a..0d31945e32 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kameletrepositoryspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kameletrepositoryspec.go @@ -21,7 +21,10 @@ package v1 // KameletRepositorySpecApplyConfiguration represents a declarative configuration of the KameletRepositorySpec type for use // with apply. +// +// KameletRepositorySpec defines the location of the Kamelet catalog to use. type KameletRepositorySpecApplyConfiguration struct { + // the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER URI *string `json:"uri,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kameletspec.go b/pkg/client/camel/applyconfiguration/camel/v1/kameletspec.go index fb3c063bdd..6a2929523e 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kameletspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kameletspec.go @@ -25,9 +25,14 @@ import ( // KameletSpecApplyConfiguration represents a declarative configuration of the KameletSpec type for use // with apply. +// +// KameletSpec specifies the configuration required to execute a Kamelet. type KameletSpecApplyConfiguration struct { KameletSpecBaseApplyConfiguration `json:",inline"` - Versions map[string]KameletSpecBaseApplyConfiguration `json:"versions,omitempty"` + // the optional versions available for this Kamelet. This field may not be taken in account by Camel core and is meant to support + // any user defined versioning model on cluster only. If the user wants to use any given version, she must materialize a file with the given version spec + // as the `main` Kamelet spec on the runtime. + Versions map[string]KameletSpecBaseApplyConfiguration `json:"versions,omitempty"` } // KameletSpecApplyConfiguration constructs a declarative configuration of the KameletSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kameletspecbase.go b/pkg/client/camel/applyconfiguration/camel/v1/kameletspecbase.go index 254cd616bc..3235c51297 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kameletspecbase.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kameletspecbase.go @@ -25,13 +25,22 @@ import ( // KameletSpecBaseApplyConfiguration represents a declarative configuration of the KameletSpecBase type for use // with apply. +// +// KameletSpecBase specifies the base configuration of a Kamelet. type KameletSpecBaseApplyConfiguration struct { - Definition *JSONSchemaPropsApplyConfiguration `json:"definition,omitempty"` - Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` - Template *TemplateApplyConfiguration `json:"template,omitempty"` - Types map[camelv1.TypeSlot]EventTypeSpecApplyConfiguration `json:"types,omitempty"` - DataTypes map[camelv1.TypeSlot]DataTypesSpecApplyConfiguration `json:"dataTypes,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` + // defines the formal configuration of the Kamelet + Definition *JSONSchemaPropsApplyConfiguration `json:"definition,omitempty"` + // sources in any Camel DSL supported + Sources []SourceSpecApplyConfiguration `json:"sources,omitempty"` + // the main source in YAML DSL + Template *TemplateApplyConfiguration `json:"template,omitempty"` + // data specification types for the events consumed/produced by the Kamelet + // Deprecated: In favor of using DataTypes + Types map[camelv1.TypeSlot]EventTypeSpecApplyConfiguration `json:"types,omitempty"` + // data specification types for the events consumed/produced by the Kamelet + DataTypes map[camelv1.TypeSlot]DataTypesSpecApplyConfiguration `json:"dataTypes,omitempty"` + // Camel dependencies needed by the Kamelet + Dependencies []string `json:"dependencies,omitempty"` } // KameletSpecBaseApplyConfiguration constructs a declarative configuration of the KameletSpecBase type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kameletstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/kameletstatus.go index 820fc2fb89..bb7faae493 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kameletstatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kameletstatus.go @@ -25,11 +25,17 @@ import ( // KameletStatusApplyConfiguration represents a declarative configuration of the KameletStatus type for use // with apply. +// +// KameletStatus defines the observed state of Kamelet. type KameletStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.KameletPhase `json:"phase,omitempty"` - Conditions []KameletConditionApplyConfiguration `json:"conditions,omitempty"` - Properties []KameletPropertyApplyConfiguration `json:"properties,omitempty"` + // ObservedGeneration is the most recent generation observed for this Kamelet. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // Phase -- + Phase *camelv1.KameletPhase `json:"phase,omitempty"` + // Conditions -- + Conditions []KameletConditionApplyConfiguration `json:"conditions,omitempty"` + // Properties -- + Properties []KameletPropertyApplyConfiguration `json:"properties,omitempty"` } // KameletStatusApplyConfiguration constructs a declarative configuration of the KameletStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kanikotask.go b/pkg/client/camel/applyconfiguration/camel/v1/kanikotask.go index 7ed5561ffd..dde385c749 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kanikotask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kanikotask.go @@ -21,12 +21,19 @@ package v1 // KanikoTaskApplyConfiguration represents a declarative configuration of the KanikoTask type for use // with apply. +// +// KanikoTask is used to configure Kaniko. +// +// Deprecated: no longer in use. type KanikoTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` PublishTaskApplyConfiguration `json:",inline"` - Verbose *bool `json:"verbose,omitempty"` - Cache *KanikoTaskCacheApplyConfiguration `json:"cache,omitempty"` - ExecutorImage *string `json:"executorImage,omitempty"` + // log more information + Verbose *bool `json:"verbose,omitempty"` + // use a cache + Cache *KanikoTaskCacheApplyConfiguration `json:"cache,omitempty"` + // docker image to use + ExecutorImage *string `json:"executorImage,omitempty"` } // KanikoTaskApplyConfiguration constructs a declarative configuration of the KanikoTask type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/kanikotaskcache.go b/pkg/client/camel/applyconfiguration/camel/v1/kanikotaskcache.go index 24228cdba9..bdc3b50a00 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/kanikotaskcache.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/kanikotaskcache.go @@ -21,8 +21,14 @@ package v1 // KanikoTaskCacheApplyConfiguration represents a declarative configuration of the KanikoTaskCache type for use // with apply. +// +// KanikoTaskCache is used to configure Kaniko cache. +// +// Deprecated: no longer in use. type KanikoTaskCacheApplyConfiguration struct { - Enabled *bool `json:"enabled,omitempty"` + // true if a cache is enabled + Enabled *bool `json:"enabled,omitempty"` + // the PVC used to store the cache PersistentVolumeClaim *string `json:"persistentVolumeClaim,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/mavenartifact.go b/pkg/client/camel/applyconfiguration/camel/v1/mavenartifact.go index 12be4352bc..605843fb47 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/mavenartifact.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/mavenartifact.go @@ -21,11 +21,18 @@ package v1 // MavenArtifactApplyConfiguration represents a declarative configuration of the MavenArtifact type for use // with apply. +// +// MavenArtifact defines a GAV (Group:Artifact:Type:Version:Classifier) Maven artifact. type MavenArtifactApplyConfiguration struct { - GroupID *string `json:"groupId,omitempty"` + // Maven Group + GroupID *string `json:"groupId,omitempty"` + // Maven Artifact ArtifactID *string `json:"artifactId,omitempty"` - Type *string `json:"type,omitempty"` - Version *string `json:"version,omitempty"` + // Maven Type + Type *string `json:"type,omitempty"` + // Maven Version + Version *string `json:"version,omitempty"` + // Maven Classifier Classifier *string `json:"classifier,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/mavenbuildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/mavenbuildspec.go index b8ba49df48..f9532c2747 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/mavenbuildspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/mavenbuildspec.go @@ -25,10 +25,15 @@ import ( // MavenBuildSpecApplyConfiguration represents a declarative configuration of the MavenBuildSpec type for use // with apply. +// +// MavenBuildSpec defines the Maven configuration plus additional repositories to use. type MavenBuildSpecApplyConfiguration struct { + // base Maven specification MavenSpecApplyConfiguration `json:",inline"` - Repositories []RepositoryApplyConfiguration `json:"repositories,omitempty"` - Servers []ServerApplyConfiguration `json:"servers,omitempty"` + // additional repositories + Repositories []RepositoryApplyConfiguration `json:"repositories,omitempty"` + // Servers (auth) + Servers []ServerApplyConfiguration `json:"servers,omitempty"` } // MavenBuildSpecApplyConfiguration constructs a declarative configuration of the MavenBuildSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/mavenspec.go b/pkg/client/camel/applyconfiguration/camel/v1/mavenspec.go index 4fa73b5357..436f6aba41 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/mavenspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/mavenspec.go @@ -25,15 +25,36 @@ import ( // MavenSpecApplyConfiguration represents a declarative configuration of the MavenSpec type for use // with apply. +// +// MavenSpec --. type MavenSpecApplyConfiguration struct { - LocalRepository *string `json:"localRepository,omitempty"` - Properties map[string]string `json:"properties,omitempty"` - Profiles []ValueSourceApplyConfiguration `json:"profiles,omitempty"` - Settings *ValueSourceApplyConfiguration `json:"settings,omitempty"` - SettingsSecurity *ValueSourceApplyConfiguration `json:"settingsSecurity,omitempty"` - CASecrets []corev1.SecretKeySelector `json:"caSecrets,omitempty"` - Extension []MavenArtifactApplyConfiguration `json:"extension,omitempty"` - CLIOptions []string `json:"cliOptions,omitempty"` + // The path of the local Maven repository. + LocalRepository *string `json:"localRepository,omitempty"` + // The Maven properties. + Properties map[string]string `json:"properties,omitempty"` + // A reference to the ConfigMap or Secret key that contains + // the Maven profile. + Profiles []ValueSourceApplyConfiguration `json:"profiles,omitempty"` + // A reference to the ConfigMap or Secret key that contains + // the Maven settings. + Settings *ValueSourceApplyConfiguration `json:"settings,omitempty"` + // A reference to the ConfigMap or Secret key that contains + // the security of the Maven settings. + SettingsSecurity *ValueSourceApplyConfiguration `json:"settingsSecurity,omitempty"` + // The Secrets name and key, containing the CA certificate(s) used to connect + // to remote Maven repositories. + // It can contain X.509 certificates, and PKCS#7 formatted certificate chains. + // A JKS formatted keystore is automatically created to store the CA certificate(s), + // and configured to be used as a trusted certificate(s) by the Maven commands. + // Note that the root CA certificates are also imported into the created keystore. + CASecrets []corev1.SecretKeySelector `json:"caSecrets,omitempty"` + // The Maven build extensions. + // See https://maven.apache.org/guides/mini/guide-using-extensions.html. + Extension []MavenArtifactApplyConfiguration `json:"extension,omitempty"` + // The CLI options that are appended to the list of arguments for Maven commands, + // e.g., `-V,--no-transfer-progress,-Dstyle.color=never`. + // See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html. + CLIOptions []string `json:"cliOptions,omitempty"` } // MavenSpecApplyConfiguration constructs a declarative configuration of the MavenSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/pipe.go b/pkg/client/camel/applyconfiguration/camel/v1/pipe.go index a85195864f..7e1ae47b46 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/pipe.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/pipe.go @@ -27,11 +27,15 @@ import ( // PipeApplyConfiguration represents a declarative configuration of the Pipe type for use // with apply. +// +// Pipe is the Schema for the Pipe API. type PipeApplyConfiguration struct { metav1.TypeMetaApplyConfiguration `json:",inline"` *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *PipeSpecApplyConfiguration `json:"spec,omitempty"` - Status *PipeStatusApplyConfiguration `json:"status,omitempty"` + // the specification of a Pipe + Spec *PipeSpecApplyConfiguration `json:"spec,omitempty"` + // the status of a Pipe + Status *PipeStatusApplyConfiguration `json:"status,omitempty"` } // Pipe constructs a declarative configuration of the Pipe type for use with @@ -44,6 +48,7 @@ func Pipe(name, namespace string) *PipeApplyConfiguration { b.WithAPIVersion("camel.apache.org/v1") return b } + func (b PipeApplyConfiguration) IsApplyConfiguration() {} // WithKind sets the Kind field in the declarative configuration to the given value diff --git a/pkg/client/camel/applyconfiguration/camel/v1/pipecondition.go b/pkg/client/camel/applyconfiguration/camel/v1/pipecondition.go index 84a158d4f0..37d164a8b0 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/pipecondition.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/pipecondition.go @@ -27,14 +27,23 @@ import ( // PipeConditionApplyConfiguration represents a declarative configuration of the PipeCondition type for use // with apply. +// +// PipeCondition describes the state of a resource at a certain point. type PipeConditionApplyConfiguration struct { - Type *camelv1.PipeConditionType `json:"type,omitempty"` - Status *corev1.ConditionStatus `json:"status,omitempty"` - LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` - Pods []PodConditionApplyConfiguration `json:"pods,omitempty"` + // Type of pipe condition. + Type *camelv1.PipeConditionType `json:"type,omitempty"` + // Status of the condition, one of True, False, Unknown. + Status *corev1.ConditionStatus `json:"status,omitempty"` + // The last time this condition was updated. + LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"` + // Last time the condition transitioned from one status to another. + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + // The reason for the condition's last transition. + Reason *string `json:"reason,omitempty"` + // A human readable message indicating details about the transition. + Message *string `json:"message,omitempty"` + // Pods collect health and conditions information from the owned PODs + Pods []PodConditionApplyConfiguration `json:"pods,omitempty"` } // PipeConditionApplyConfiguration constructs a declarative configuration of the PipeCondition type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/pipespec.go b/pkg/client/camel/applyconfiguration/camel/v1/pipespec.go index 8b5c220d57..402d81ce64 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/pipespec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/pipespec.go @@ -21,16 +21,28 @@ package v1 // PipeSpecApplyConfiguration represents a declarative configuration of the PipeSpec type for use // with apply. +// +// PipeSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling. type PipeSpecApplyConfiguration struct { - Integration *IntegrationSpecApplyConfiguration `json:"integration,omitempty"` - Source *EndpointApplyConfiguration `json:"source,omitempty"` - Sink *EndpointApplyConfiguration `json:"sink,omitempty"` - ErrorHandler *ErrorHandlerSpecApplyConfiguration `json:"errorHandler,omitempty"` - Traits *TraitsApplyConfiguration `json:"traits,omitempty"` - Steps []EndpointApplyConfiguration `json:"steps,omitempty"` - Replicas *int32 `json:"replicas,omitempty"` - ServiceAccountName *string `json:"serviceAccountName,omitempty"` - Dependencies []string `json:"dependencies,omitempty"` + // Integration is an optional integration used to specify custom parameters + // Deprecated don't use this. Use trait annotations if you need to change any cluster configuration. + Integration *IntegrationSpecApplyConfiguration `json:"integration,omitempty"` + // Source is the starting point of the integration defined by this Pipe + Source *EndpointApplyConfiguration `json:"source,omitempty"` + // Sink is the destination of the integration defined by this Pipe + Sink *EndpointApplyConfiguration `json:"sink,omitempty"` + // ErrorHandler is an optional handler called upon an error occurring in the integration + ErrorHandler *ErrorHandlerSpecApplyConfiguration `json:"errorHandler,omitempty"` + // the traits needed to customize the depending Integration + Traits *TraitsApplyConfiguration `json:"traits,omitempty"` + // Steps contains an optional list of intermediate steps that are executed between the Source and the Sink + Steps []EndpointApplyConfiguration `json:"steps,omitempty"` + // Replicas is the number of desired replicas for the Pipe + Replicas *int32 `json:"replicas,omitempty"` + // Custom SA to use for the Pipe + ServiceAccountName *string `json:"serviceAccountName,omitempty"` + // the list of Camel or Maven dependencies required by the Pipe + Dependencies []string `json:"dependencies,omitempty"` } // PipeSpecApplyConfiguration constructs a declarative configuration of the PipeSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/pipestatus.go b/pkg/client/camel/applyconfiguration/camel/v1/pipestatus.go index 3b9a42012a..1b9a3756f1 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/pipestatus.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/pipestatus.go @@ -25,12 +25,19 @@ import ( // PipeStatusApplyConfiguration represents a declarative configuration of the PipeStatus type for use // with apply. +// +// PipeStatus specify the status of a Pipe. type PipeStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Phase *camelv1.PipePhase `json:"phase,omitempty"` - Conditions []PipeConditionApplyConfiguration `json:"conditions,omitempty"` - Replicas *int32 `json:"replicas,omitempty"` - Selector *string `json:"selector,omitempty"` + // ObservedGeneration is the most recent generation observed for this Pipe. + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + // Phase -- + Phase *camelv1.PipePhase `json:"phase,omitempty"` + // Conditions -- + Conditions []PipeConditionApplyConfiguration `json:"conditions,omitempty"` + // Replicas is the number of actual replicas of the pipe + Replicas *int32 `json:"replicas,omitempty"` + // Selector allows to identify pods belonging to the pipe + Selector *string `json:"selector,omitempty"` } // PipeStatusApplyConfiguration constructs a declarative configuration of the PipeStatus type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/podspec.go b/pkg/client/camel/applyconfiguration/camel/v1/podspec.go index a324b38d1f..9f7d9a8b99 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/podspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/podspec.go @@ -25,19 +25,33 @@ import ( // PodSpecApplyConfiguration represents a declarative configuration of the PodSpec type for use // with apply. +// +// PodSpec defines a group of Kubernetes resources. type PodSpecApplyConfiguration struct { - AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` - Volumes []corev1.Volume `json:"volumes,omitempty"` - InitContainers []corev1.Container `json:"initContainers,omitempty"` - Containers []corev1.Container `json:"containers,omitempty"` - EphemeralContainers []corev1.EphemeralContainer `json:"ephemeralContainers,omitempty"` - RestartPolicy *corev1.RestartPolicy `json:"restartPolicy,omitempty"` - TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"` - ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` - DNSPolicy *corev1.DNSPolicy `json:"dnsPolicy,omitempty"` - NodeSelector map[string]string `json:"nodeSelector,omitempty"` - TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"` - SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"` + // AutomountServiceAccountToken + AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"` + // Volumes + Volumes []corev1.Volume `json:"volumes,omitempty"` + // InitContainers + InitContainers []corev1.Container `json:"initContainers,omitempty"` + // Containers + Containers []corev1.Container `json:"containers,omitempty"` + // EphemeralContainers + EphemeralContainers []corev1.EphemeralContainer `json:"ephemeralContainers,omitempty"` + // RestartPolicy + RestartPolicy *corev1.RestartPolicy `json:"restartPolicy,omitempty"` + // TerminationGracePeriodSeconds + TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"` + // ActiveDeadlineSeconds + ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"` + // DNSPolicy + DNSPolicy *corev1.DNSPolicy `json:"dnsPolicy,omitempty"` + // NodeSelector + NodeSelector map[string]string `json:"nodeSelector,omitempty"` + // TopologySpreadConstraints + TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"` + // PodSecurityContext + SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"` } // PodSpecApplyConfiguration constructs a declarative configuration of the PodSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/podspectemplate.go b/pkg/client/camel/applyconfiguration/camel/v1/podspectemplate.go index 49162c30ee..2a2eb69355 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/podspectemplate.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/podspectemplate.go @@ -21,7 +21,10 @@ package v1 // PodSpecTemplateApplyConfiguration represents a declarative configuration of the PodSpecTemplate type for use // with apply. +// +// PodSpecTemplate represent a template used to deploy an Integration `Pod`. type PodSpecTemplateApplyConfiguration struct { + // the specification Spec *PodSpecApplyConfiguration `json:"spec,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/publishtask.go b/pkg/client/camel/applyconfiguration/camel/v1/publishtask.go index 00ae09f52f..9095051f99 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/publishtask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/publishtask.go @@ -21,11 +21,17 @@ package v1 // PublishTaskApplyConfiguration represents a declarative configuration of the PublishTask type for use // with apply. +// +// PublishTask image publish configuration. type PublishTaskApplyConfiguration struct { - ContextDir *string `json:"contextDir,omitempty"` - BaseImage *string `json:"baseImage,omitempty"` - Image *string `json:"image,omitempty"` - Registry *RegistrySpecApplyConfiguration `json:"registry,omitempty"` + // can be useful to share info with other tasks + ContextDir *string `json:"contextDir,omitempty"` + // base image layer + BaseImage *string `json:"baseImage,omitempty"` + // final image name + Image *string `json:"image,omitempty"` + // where to publish the final image + Registry *RegistrySpecApplyConfiguration `json:"registry,omitempty"` } // PublishTaskApplyConfiguration constructs a declarative configuration of the PublishTask type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/registryspec.go b/pkg/client/camel/applyconfiguration/camel/v1/registryspec.go index ea71a0f105..0ff6b380e3 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/registryspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/registryspec.go @@ -21,11 +21,18 @@ package v1 // RegistrySpecApplyConfiguration represents a declarative configuration of the RegistrySpec type for use // with apply. +// +// RegistrySpec provides the configuration for the container registry. type RegistrySpecApplyConfiguration struct { - Insecure *bool `json:"insecure,omitempty"` - Address *string `json:"address,omitempty"` - Secret *string `json:"secret,omitempty"` - CA *string `json:"ca,omitempty"` + // if the container registry is insecure (ie, http only) + Insecure *bool `json:"insecure,omitempty"` + // the URI to access + Address *string `json:"address,omitempty"` + // the secret where credentials are stored + Secret *string `json:"secret,omitempty"` + // the configmap which stores the Certificate Authority + CA *string `json:"ca,omitempty"` + // the registry organization Organization *string `json:"organization,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/repository.go b/pkg/client/camel/applyconfiguration/camel/v1/repository.go index 03e7139cf7..6f1b05e5bc 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/repository.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/repository.go @@ -21,12 +21,19 @@ package v1 // RepositoryApplyConfiguration represents a declarative configuration of the Repository type for use // with apply. +// +// Repository defines a Maven repository. type RepositoryApplyConfiguration struct { - ID *string `json:"id,omitempty"` - Name *string `json:"name,omitempty"` - URL *string `json:"url,omitempty"` + // identifies the repository + ID *string `json:"id,omitempty"` + // name of the repository + Name *string `json:"name,omitempty"` + // location of the repository + URL *string `json:"url,omitempty"` + // can use snapshot Snapshots *RepositoryPolicyApplyConfiguration `json:"snapshots,omitempty"` - Releases *RepositoryPolicyApplyConfiguration `json:"releases,omitempty"` + // can use stable releases + Releases *RepositoryPolicyApplyConfiguration `json:"releases,omitempty"` } // RepositoryApplyConfiguration constructs a declarative configuration of the Repository type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/repositorypolicy.go b/pkg/client/camel/applyconfiguration/camel/v1/repositorypolicy.go index 61df6fd599..c7a25a8d3f 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/repositorypolicy.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/repositorypolicy.go @@ -21,9 +21,17 @@ package v1 // RepositoryPolicyApplyConfiguration represents a declarative configuration of the RepositoryPolicy type for use // with apply. +// +// RepositoryPolicy defines the policy associated to a Maven repository. type RepositoryPolicyApplyConfiguration struct { - Enabled *bool `json:"enabled,omitempty"` - UpdatePolicy *string `json:"updatePolicy,omitempty"` + // is the policy activated or not + Enabled *bool `json:"enabled,omitempty"` + // This element specifies how often updates should attempt to occur. + // Maven will compare the local POM's timestamp (stored in a repository's maven-metadata file) to the remote. + // The choices are: `always`, `daily` (default), `interval:X` (where X is an integer in minutes) or `never` + UpdatePolicy *string `json:"updatePolicy,omitempty"` + // When Maven deploys files to the repository, it also deploys corresponding checksum files. + // Your options are to `ignore`, `fail`, or `warn` on missing or incorrect checksums. ChecksumPolicy *string `json:"checksumPolicy,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go b/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go index e13bb743ec..57368bc301 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go @@ -25,13 +25,21 @@ import ( // RuntimeSpecApplyConfiguration represents a declarative configuration of the RuntimeSpec type for use // with apply. +// +// RuntimeSpec represents the configuration for the Java runtime in charge to execute the Camel application. type RuntimeSpecApplyConfiguration struct { - Version *string `json:"version,omitempty"` - Provider *camelv1.RuntimeProvider `json:"provider,omitempty"` - ApplicationClass *string `json:"applicationClass,omitempty"` - Dependencies []MavenArtifactApplyConfiguration `json:"dependencies,omitempty"` - Metadata map[string]string `json:"metadata,omitempty"` - Capabilities map[string]CapabilityApplyConfiguration `json:"capabilities,omitempty"` + // Camel K Runtime version + Version *string `json:"version,omitempty"` + // Camel main application provider, ie, Camel Quarkus + Provider *camelv1.RuntimeProvider `json:"provider,omitempty"` + // application entry point (main) to be executed + ApplicationClass *string `json:"applicationClass,omitempty"` + // list of dependencies needed to run the application + Dependencies []MavenArtifactApplyConfiguration `json:"dependencies,omitempty"` + // set of metadata + Metadata map[string]string `json:"metadata,omitempty"` + // features offered by this runtime + Capabilities map[string]CapabilityApplyConfiguration `json:"capabilities,omitempty"` } // RuntimeSpecApplyConfiguration constructs a declarative configuration of the RuntimeSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/s2itask.go b/pkg/client/camel/applyconfiguration/camel/v1/s2itask.go index c106b98820..184f3d076b 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/s2itask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/s2itask.go @@ -21,10 +21,13 @@ package v1 // S2iTaskApplyConfiguration represents a declarative configuration of the S2iTask type for use // with apply. +// +// S2iTask is used to configure S2I. type S2iTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` PublishTaskApplyConfiguration `json:",inline"` - Tag *string `json:"tag,omitempty"` + // used by the ImageStream + Tag *string `json:"tag,omitempty"` } // S2iTaskApplyConfiguration constructs a declarative configuration of the S2iTask type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/server.go b/pkg/client/camel/applyconfiguration/camel/v1/server.go index bb21baef3c..2eb0d79ab8 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/server.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/server.go @@ -25,6 +25,8 @@ import ( // ServerApplyConfiguration represents a declarative configuration of the Server type for use // with apply. +// +// Server see link:https://maven.apache.org/settings.html[Maven settings]. type ServerApplyConfiguration struct { ID *string `json:"id,omitempty"` Username *string `json:"username,omitempty"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go b/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go index 8442ddff5c..ed3ee00c1f 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go @@ -25,14 +25,27 @@ import ( // SourceSpecApplyConfiguration represents a declarative configuration of the SourceSpec type for use // with apply. +// +// SourceSpec defines the configuration for one or more routes to be executed in a certain Camel DSL language. type SourceSpecApplyConfiguration struct { + // contains configuration related to the source code DataSpecApplyConfiguration `json:",inline"` - Language *camelv1.Language `json:"language,omitempty"` - Loader *string `json:"loader,omitempty"` - Interceptors []string `json:"interceptors,omitempty"` - Type *camelv1.SourceType `json:"type,omitempty"` - PropertyNames []string `json:"property-names,omitempty"` - FromKamelet *bool `json:"from-kamelet,omitempty"` + // specify which is the language (Camel DSL) used to interpret this source code + Language *camelv1.Language `json:"language,omitempty"` + // Loader is an optional id of the org.apache.camel.k.RoutesLoader that will + // interpret this source at runtime + Loader *string `json:"loader,omitempty"` + // Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader + // uses to pre/post process sources. + // + // Deprecated: no longer in use. + Interceptors []string `json:"interceptors,omitempty"` + // Type defines the kind of source described by this object + Type *camelv1.SourceType `json:"type,omitempty"` + // List of property names defined in the source (e.g. if type is "template") + PropertyNames []string `json:"property-names,omitempty"` + // True if the spec is generated from a Kamelet + FromKamelet *bool `json:"from-kamelet,omitempty"` } // SourceSpecApplyConfiguration constructs a declarative configuration of the SourceSpec type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/spectrumtask.go b/pkg/client/camel/applyconfiguration/camel/v1/spectrumtask.go index d43a367602..2c633186dd 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/spectrumtask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/spectrumtask.go @@ -21,6 +21,10 @@ package v1 // SpectrumTaskApplyConfiguration represents a declarative configuration of the SpectrumTask type for use // with apply. +// +// SpectrumTask is used to configure Spectrum. +// +// Deprecated: no longer in use. type SpectrumTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` PublishTaskApplyConfiguration `json:",inline"` diff --git a/pkg/client/camel/applyconfiguration/camel/v1/task.go b/pkg/client/camel/applyconfiguration/camel/v1/task.go index 8234ad2c46..589f674053 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/task.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/task.go @@ -21,15 +21,34 @@ package v1 // TaskApplyConfiguration represents a declarative configuration of the Task type for use // with apply. +// +// Task represents the abstract task. Only one of the task should be configured to represent the specific task chosen. type TaskApplyConfiguration struct { - Builder *BuilderTaskApplyConfiguration `json:"builder,omitempty"` - Custom *UserTaskApplyConfiguration `json:"custom,omitempty"` - Package *BuilderTaskApplyConfiguration `json:"package,omitempty"` - Buildah *BuildahTaskApplyConfiguration `json:"buildah,omitempty"` - Kaniko *KanikoTaskApplyConfiguration `json:"kaniko,omitempty"` + // a BuilderTask, used to generate and build the project + Builder *BuilderTaskApplyConfiguration `json:"builder,omitempty"` + // User customizable task execution. These are executed after the build and before the package task. + Custom *UserTaskApplyConfiguration `json:"custom,omitempty"` + // Application pre publishing + // a PackageTask, used to package the project + Package *BuilderTaskApplyConfiguration `json:"package,omitempty"` + // a BuildahTask, for Buildah strategy. + // + // Deprecated: use jib or a custom publishing strategy instead + Buildah *BuildahTaskApplyConfiguration `json:"buildah,omitempty"` + // a KanikoTask, for Kaniko strategy. + // + // Deprecated: use jib or a custom publishing strategy instead + Kaniko *KanikoTaskApplyConfiguration `json:"kaniko,omitempty"` + // a SpectrumTask, for Spectrum strategy. + // + // Deprecated: use jib or a custom publishing strategy instead Spectrum *SpectrumTaskApplyConfiguration `json:"spectrum,omitempty"` - S2i *S2iTaskApplyConfiguration `json:"s2i,omitempty"` - Jib *JibTaskApplyConfiguration `json:"jib,omitempty"` + // a S2iTask, for S2I strategy. + // + // Deprecated: use jib or a custom publishing strategy instead + S2i *S2iTaskApplyConfiguration `json:"s2i,omitempty"` + // a JibTask, for Jib strategy + Jib *JibTaskApplyConfiguration `json:"jib,omitempty"` } // TaskApplyConfiguration constructs a declarative configuration of the Task type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/template.go b/pkg/client/camel/applyconfiguration/camel/v1/template.go index a48ff49950..27390ed348 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/template.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/template.go @@ -25,7 +25,10 @@ import ( // TemplateApplyConfiguration represents a declarative configuration of the Template type for use // with apply. +// +// Template is an unstructured object representing a Kamelet template in YAML/JSON DSL. type TemplateApplyConfiguration struct { + // an unstructured raw message camelv1.RawMessage `json:",inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go b/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go index 0c417f494c..91ac887852 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go @@ -25,7 +25,12 @@ import ( // TraitConfigurationApplyConfiguration represents a declarative configuration of the TraitConfiguration type for use // with apply. +// +// TraitConfiguration represents the expected configuration for a given trait parameter. +// +// Deprecated: superseded by each Trait type, left for backward compatibility. type TraitConfigurationApplyConfiguration struct { + // generic raw message, typically a map containing the keys (trait parameters) and the values (either single text or array) camelv1.RawMessage `json:",inline"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/traits.go b/pkg/client/camel/applyconfiguration/camel/v1/traits.go index f5a00307f4..d86eece44b 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/traits.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/traits.go @@ -25,51 +25,111 @@ import ( // TraitsApplyConfiguration represents a declarative configuration of the Traits type for use // with apply. +// +// Traits represents the collection of trait configurations. type TraitsApplyConfiguration struct { - Affinity *trait.AffinityTrait `json:"affinity,omitempty"` - Builder *trait.BuilderTrait `json:"builder,omitempty"` - Camel *trait.CamelTrait `json:"camel,omitempty"` - Container *trait.ContainerTrait `json:"container,omitempty"` - Cron *trait.CronTrait `json:"cron,omitempty"` - Dependencies *trait.DependenciesTrait `json:"dependencies,omitempty"` - Deployer *trait.DeployerTrait `json:"deployer,omitempty"` - Deployment *trait.DeploymentTrait `json:"deployment,omitempty"` - Environment *trait.EnvironmentTrait `json:"environment,omitempty"` - ErrorHandler *trait.ErrorHandlerTrait `json:"error-handler,omitempty"` - GC *trait.GCTrait `json:"gc,omitempty"` - GitOps *trait.GitOpsTrait `json:"gitops,omitempty"` - Health *trait.HealthTrait `json:"health,omitempty"` - Ingress *trait.IngressTrait `json:"ingress,omitempty"` - InitContainers *trait.InitContainersTrait `json:"init-containers,omitempty"` - Istio *trait.IstioTrait `json:"istio,omitempty"` - Jolokia *trait.JolokiaTrait `json:"jolokia,omitempty"` - JVM *trait.JVMTrait `json:"jvm,omitempty"` - Kamelets *trait.KameletsTrait `json:"kamelets,omitempty"` - Keda *trait.KedaTrait `json:"keda,omitempty"` - Knative *trait.KnativeTrait `json:"knative,omitempty"` - KnativeService *trait.KnativeServiceTrait `json:"knative-service,omitempty"` - Logging *trait.LoggingTrait `json:"logging,omitempty"` - Master *trait.MasterTrait `json:"master,omitempty"` - Mount *trait.MountTrait `json:"mount,omitempty"` - OpenAPI *trait.OpenAPITrait `json:"openapi,omitempty"` - Owner *trait.OwnerTrait `json:"owner,omitempty"` - PDB *trait.PDBTrait `json:"pdb,omitempty"` - Platform *trait.PlatformTrait `json:"platform,omitempty"` - Pod *trait.PodTrait `json:"pod,omitempty"` - Prometheus *trait.PrometheusTrait `json:"prometheus,omitempty"` - PullSecret *trait.PullSecretTrait `json:"pull-secret,omitempty"` - Quarkus *trait.QuarkusTrait `json:"quarkus,omitempty"` - Registry *trait.RegistryTrait `json:"registry,omitempty"` - Route *trait.RouteTrait `json:"route,omitempty"` - SecurityContext *trait.SecurityContextTrait `json:"security-context,omitempty"` - Service *trait.ServiceTrait `json:"service,omitempty"` - ServiceBinding *trait.ServiceBindingTrait `json:"service-binding,omitempty"` - Telemetry *trait.TelemetryTrait `json:"telemetry,omitempty"` - Toleration *trait.TolerationTrait `json:"toleration,omitempty"` - Addons map[string]AddonTraitApplyConfiguration `json:"addons,omitempty"` - Strimzi *TraitSpecApplyConfiguration `json:"strimzi,omitempty"` - ThreeScale *TraitSpecApplyConfiguration `json:"3scale,omitempty"` - Tracing *TraitSpecApplyConfiguration `json:"tracing,omitempty"` + // The configuration of Affinity trait + Affinity *trait.AffinityTrait `json:"affinity,omitempty"` + // The configuration of Builder trait + Builder *trait.BuilderTrait `json:"builder,omitempty"` + // The configuration of Camel trait + Camel *trait.CamelTrait `json:"camel,omitempty"` + // The configuration of Container trait + Container *trait.ContainerTrait `json:"container,omitempty"` + // The configuration of Cron trait + Cron *trait.CronTrait `json:"cron,omitempty"` + // The configuration of Dependencies trait + Dependencies *trait.DependenciesTrait `json:"dependencies,omitempty"` + // The configuration of Deployer trait + Deployer *trait.DeployerTrait `json:"deployer,omitempty"` + // The configuration of Deployment trait + Deployment *trait.DeploymentTrait `json:"deployment,omitempty"` + // The configuration of Environment trait + Environment *trait.EnvironmentTrait `json:"environment,omitempty"` + // The configuration of Error Handler trait. + // + // Deprecated: no longer in use. + ErrorHandler *trait.ErrorHandlerTrait `json:"error-handler,omitempty"` + // The configuration of GC trait + GC *trait.GCTrait `json:"gc,omitempty"` + // The configuration of GitOps trait + GitOps *trait.GitOpsTrait `json:"gitops,omitempty"` + // The configuration of Health trait + Health *trait.HealthTrait `json:"health,omitempty"` + // The configuration of Ingress trait + Ingress *trait.IngressTrait `json:"ingress,omitempty"` + // The configuration of Init Containers trait + InitContainers *trait.InitContainersTrait `json:"init-containers,omitempty"` + // The configuration of Istio trait + Istio *trait.IstioTrait `json:"istio,omitempty"` + // The configuration of Jolokia trait. + // + // Deprecated: use jvm.agent instead. + Jolokia *trait.JolokiaTrait `json:"jolokia,omitempty"` + // The configuration of JVM trait + JVM *trait.JVMTrait `json:"jvm,omitempty"` + // The configuration of Kamelets trait + Kamelets *trait.KameletsTrait `json:"kamelets,omitempty"` + // The configuration of Keda trait + Keda *trait.KedaTrait `json:"keda,omitempty"` + // The configuration of Knative trait + Knative *trait.KnativeTrait `json:"knative,omitempty"` + // The configuration of Knative Service trait + KnativeService *trait.KnativeServiceTrait `json:"knative-service,omitempty"` + // The configuration of Logging trait + Logging *trait.LoggingTrait `json:"logging,omitempty"` + // The configuration of Master trait + Master *trait.MasterTrait `json:"master,omitempty"` + // The configuration of Mount trait + Mount *trait.MountTrait `json:"mount,omitempty"` + // The configuration of OpenAPI trait. + // + // Deprecated: no longer in use. + OpenAPI *trait.OpenAPITrait `json:"openapi,omitempty"` + // The configuration of Owner trait + Owner *trait.OwnerTrait `json:"owner,omitempty"` + // The configuration of PDB trait + PDB *trait.PDBTrait `json:"pdb,omitempty"` + // The configuration of Platform trait + Platform *trait.PlatformTrait `json:"platform,omitempty"` + // The configuration of Pod trait. + // + // Deprecated: use init-containers instead. + Pod *trait.PodTrait `json:"pod,omitempty"` + // The configuration of Prometheus trait + Prometheus *trait.PrometheusTrait `json:"prometheus,omitempty"` + // The configuration of Pull Secret trait + PullSecret *trait.PullSecretTrait `json:"pull-secret,omitempty"` + // The configuration of Quarkus trait + Quarkus *trait.QuarkusTrait `json:"quarkus,omitempty"` + // The configuration of Registry trait (support removed since version 2.5.0). + // + // Deprecated: use jvm trait or read documentation. + Registry *trait.RegistryTrait `json:"registry,omitempty"` + // The configuration of Route trait. + // + // Deprecated: use ingress instead. + Route *trait.RouteTrait `json:"route,omitempty"` + // The configuration of Security Context trait + SecurityContext *trait.SecurityContextTrait `json:"security-context,omitempty"` + // The configuration of Service trait + Service *trait.ServiceTrait `json:"service,omitempty"` + // The configuration of Service Binding trait. + // + // Deprecated: no longer in use. + ServiceBinding *trait.ServiceBindingTrait `json:"service-binding,omitempty"` + // The configuration of Telemetry trait + Telemetry *trait.TelemetryTrait `json:"telemetry,omitempty"` + // The configuration of Toleration trait + Toleration *trait.TolerationTrait `json:"toleration,omitempty"` + // Deprecated: no longer in use. + Addons map[string]AddonTraitApplyConfiguration `json:"addons,omitempty"` + // Deprecated: no longer in use. + Strimzi *TraitSpecApplyConfiguration `json:"strimzi,omitempty"` + // Deprecated: no longer in use. + ThreeScale *TraitSpecApplyConfiguration `json:"3scale,omitempty"` + // Deprecated: no longer in use. + Tracing *TraitSpecApplyConfiguration `json:"tracing,omitempty"` } // TraitsApplyConfiguration constructs a declarative configuration of the Traits type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/traitspec.go b/pkg/client/camel/applyconfiguration/camel/v1/traitspec.go index 4c85b8d5ac..1854e9c920 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/traitspec.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/traitspec.go @@ -21,7 +21,12 @@ package v1 // TraitSpecApplyConfiguration represents a declarative configuration of the TraitSpec type for use // with apply. +// +// A TraitSpec contains the configuration of a trait. +// +// Deprecated: superseded by each Trait type, left for backward compatibility. type TraitSpecApplyConfiguration struct { + // TraitConfiguration parameters configuration Configuration *TraitConfigurationApplyConfiguration `json:"configuration,omitempty"` } diff --git a/pkg/client/camel/applyconfiguration/camel/v1/usertask.go b/pkg/client/camel/applyconfiguration/camel/v1/usertask.go index c3c2399796..f68a43528e 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/usertask.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/usertask.go @@ -21,13 +21,22 @@ package v1 // UserTaskApplyConfiguration represents a declarative configuration of the UserTask type for use // with apply. +// +// UserTask is used to execute any generic custom operation. type UserTaskApplyConfiguration struct { BaseTaskApplyConfiguration `json:",inline"` - ContainerImage *string `json:"image,omitempty"` - ContainerUserID *int64 `json:"userId,omitempty"` - ContainerCommand *string `json:"command,omitempty"` - ContainerCommands []string `json:"commands,omitempty"` - PublishingImage *string `json:"publishingImage,omitempty"` + // the container image to use + ContainerImage *string `json:"image,omitempty"` + // the user id used to run the container + ContainerUserID *int64 `json:"userId,omitempty"` + // the command to execute. + // + // Deprecated: use ContainerCommands + ContainerCommand *string `json:"command,omitempty"` + // the command to execute + ContainerCommands []string `json:"commands,omitempty"` + // the desired image build name + PublishingImage *string `json:"publishingImage,omitempty"` } // UserTaskApplyConfiguration constructs a declarative configuration of the UserTask type for use with diff --git a/pkg/client/camel/applyconfiguration/camel/v1/valuesource.go b/pkg/client/camel/applyconfiguration/camel/v1/valuesource.go index b5c4e33e5f..2f9e5a038d 100644 --- a/pkg/client/camel/applyconfiguration/camel/v1/valuesource.go +++ b/pkg/client/camel/applyconfiguration/camel/v1/valuesource.go @@ -25,9 +25,13 @@ import ( // ValueSourceApplyConfiguration represents a declarative configuration of the ValueSource type for use // with apply. +// +// ValueSource --. type ValueSourceApplyConfiguration struct { + // Selects a key of a ConfigMap. ConfigMapKeyRef *corev1.ConfigMapKeySelector `json:"configMapKeyRef,omitempty"` - SecretKeyRef *corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` + // Selects a key of a secret. + SecretKeyRef *corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` } // ValueSourceApplyConfiguration constructs a declarative configuration of the ValueSource type for use with diff --git a/pkg/client/camel/clientset/versioned/fake/clientset_generated.go b/pkg/client/camel/clientset/versioned/fake/clientset_generated.go index 5ab206e213..55372f55f1 100644 --- a/pkg/client/camel/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/camel/clientset/versioned/fake/clientset_generated.go @@ -37,7 +37,7 @@ import ( // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. // -// DEPRECATED: NewClientset replaces this with support for field management, which significantly improves +// Deprecated: NewClientset replaces this with support for field management, which significantly improves // server side apply testing. NewClientset is only available when apply configurations are generated (e.g. // via --with-applyconfig). func NewSimpleClientset(objects ...runtime.Object) *Clientset { @@ -53,8 +53,8 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { var opts metav1.ListOptions - if watchActcion, ok := action.(testing.WatchActionImpl); ok { - opts = watchActcion.ListOptions + if watchAction, ok := action.(testing.WatchActionImpl); ok { + opts = watchAction.ListOptions } gvr := action.GetResource() ns := action.GetNamespace() @@ -85,6 +85,17 @@ func (c *Clientset) Tracker() testing.ObjectTracker { return c.tracker } +// IsWatchListSemanticsSupported informs the reflector that this client +// doesn't support WatchList semantics. +// +// This is a synthetic method whose sole purpose is to satisfy the optional +// interface check performed by the reflector. +// Returning true signals that WatchList can NOT be used. +// No additional logic is implemented here. +func (c *Clientset) IsWatchListSemanticsUnSupported() bool { + return true +} + // NewClientset returns a clientset that will respond with the provided objects. // It's backed by a very simple object tracker that processes creates, updates and deletions as-is, // without applying any validations and/or defaults. It shouldn't be considered a replacement diff --git a/pkg/client/camel/informers/externalversions/camel/v1/build.go b/pkg/client/camel/informers/externalversions/camel/v1/build.go index fc5d178a4f..5400b8c75a 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/build.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/build.go @@ -58,7 +58,7 @@ func NewBuildInformer(client versioned.Interface, namespace string, resyncPeriod // one. This reduces memory footprint and number of connections to the server. func NewFilteredBuildInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredBuildInformer(client versioned.Interface, namespace string, resy } return client.CamelV1().Builds(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.Build{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go b/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go index 6b15c938d7..923053a0c3 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go @@ -58,7 +58,7 @@ func NewCamelCatalogInformer(client versioned.Interface, namespace string, resyn // one. This reduces memory footprint and number of connections to the server. func NewFilteredCamelCatalogInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredCamelCatalogInformer(client versioned.Interface, namespace strin } return client.CamelV1().CamelCatalogs(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.CamelCatalog{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integration.go b/pkg/client/camel/informers/externalversions/camel/v1/integration.go index 3d073a97fd..a609b0e948 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/integration.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/integration.go @@ -58,7 +58,7 @@ func NewIntegrationInformer(client versioned.Interface, namespace string, resync // one. This reduces memory footprint and number of connections to the server. func NewFilteredIntegrationInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredIntegrationInformer(client versioned.Interface, namespace string } return client.CamelV1().Integrations(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.Integration{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go b/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go index 377855bc5b..5665dd19c7 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go @@ -58,7 +58,7 @@ func NewIntegrationKitInformer(client versioned.Interface, namespace string, res // one. This reduces memory footprint and number of connections to the server. func NewFilteredIntegrationKitInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredIntegrationKitInformer(client versioned.Interface, namespace str } return client.CamelV1().IntegrationKits(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.IntegrationKit{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go b/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go index f306096edd..0a63ec392c 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go @@ -58,7 +58,7 @@ func NewIntegrationPlatformInformer(client versioned.Interface, namespace string // one. This reduces memory footprint and number of connections to the server. func NewFilteredIntegrationPlatformInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredIntegrationPlatformInformer(client versioned.Interface, namespac } return client.CamelV1().IntegrationPlatforms(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.IntegrationPlatform{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integrationprofile.go b/pkg/client/camel/informers/externalversions/camel/v1/integrationprofile.go index c5a5cbe86f..b515cb5e60 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/integrationprofile.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/integrationprofile.go @@ -58,7 +58,7 @@ func NewIntegrationProfileInformer(client versioned.Interface, namespace string, // one. This reduces memory footprint and number of connections to the server. func NewFilteredIntegrationProfileInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredIntegrationProfileInformer(client versioned.Interface, namespace } return client.CamelV1().IntegrationProfiles(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.IntegrationProfile{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/kamelet.go b/pkg/client/camel/informers/externalversions/camel/v1/kamelet.go index ee306b9c7c..a9f1a2666f 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/kamelet.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/kamelet.go @@ -58,7 +58,7 @@ func NewKameletInformer(client versioned.Interface, namespace string, resyncPeri // one. This reduces memory footprint and number of connections to the server. func NewFilteredKameletInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredKameletInformer(client versioned.Interface, namespace string, re } return client.CamelV1().Kamelets(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.Kamelet{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/camel/v1/pipe.go b/pkg/client/camel/informers/externalversions/camel/v1/pipe.go index efcedb1826..44ad78a40d 100644 --- a/pkg/client/camel/informers/externalversions/camel/v1/pipe.go +++ b/pkg/client/camel/informers/externalversions/camel/v1/pipe.go @@ -58,7 +58,7 @@ func NewPipeInformer(client versioned.Interface, namespace string, resyncPeriod // one. This reduces memory footprint and number of connections to the server. func NewFilteredPipeInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( - &cache.ListWatch{ + cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) @@ -83,7 +83,7 @@ func NewFilteredPipeInformer(client versioned.Interface, namespace string, resyn } return client.CamelV1().Pipes(namespace).Watch(ctx, options) }, - }, + }, client), &apiscamelv1.Pipe{}, resyncPeriod, indexers, diff --git a/pkg/client/camel/informers/externalversions/factory.go b/pkg/client/camel/informers/externalversions/factory.go index 622d42720e..1d5042af59 100644 --- a/pkg/client/camel/informers/externalversions/factory.go +++ b/pkg/client/camel/informers/externalversions/factory.go @@ -98,6 +98,7 @@ func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Dur // NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. // Listers obtained via this SharedInformerFactory will be subject to the same filters // as specified here. +// // Deprecated: Please use NewSharedInformerFactoryWithOptions instead func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions)) @@ -205,7 +206,7 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal // // It is typically used like this: // -// ctx, cancel := context.Background() +// ctx, cancel := context.WithCancel(context.Background()) // defer cancel() // factory := NewSharedInformerFactory(client, resyncPeriod) // defer factory.WaitForStop() // Returns immediately if nothing was started. diff --git a/pkg/client/keda/clientset/internalclientset/fake/clientset_generated.go b/pkg/client/keda/clientset/internalclientset/fake/clientset_generated.go index 18607a6303..a7f55100dd 100644 --- a/pkg/client/keda/clientset/internalclientset/fake/clientset_generated.go +++ b/pkg/client/keda/clientset/internalclientset/fake/clientset_generated.go @@ -36,7 +36,7 @@ import ( // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. // -// DEPRECATED: NewClientset replaces this with support for field management, which significantly improves +// Deprecated: NewClientset replaces this with support for field management, which significantly improves // server side apply testing. NewClientset is only available when apply configurations are generated (e.g. // via --with-applyconfig). func NewSimpleClientset(objects ...runtime.Object) *Clientset { @@ -52,8 +52,8 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { var opts metav1.ListOptions - if watchActcion, ok := action.(testing.WatchActionImpl); ok { - opts = watchActcion.ListOptions + if watchAction, ok := action.(testing.WatchActionImpl); ok { + opts = watchAction.ListOptions } gvr := action.GetResource() ns := action.GetNamespace() @@ -84,6 +84,17 @@ func (c *Clientset) Tracker() testing.ObjectTracker { return c.tracker } +// IsWatchListSemanticsSupported informs the reflector that this client +// doesn't support WatchList semantics. +// +// This is a synthetic method whose sole purpose is to satisfy the optional +// interface check performed by the reflector. +// Returning true signals that WatchList can NOT be used. +// No additional logic is implemented here. +func (c *Clientset) IsWatchListSemanticsUnSupported() bool { + return true +} + var ( _ clientset.Interface = &Clientset{} _ testing.FakeClient = &Clientset{} diff --git a/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go b/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go index 0e75f1d890..26067cab49 100644 --- a/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go +++ b/pkg/client/strimzi/clientset/internalclientset/fake/clientset_generated.go @@ -36,7 +36,7 @@ import ( // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement // for a real clientset and is mostly useful in simple unit tests. // -// DEPRECATED: NewClientset replaces this with support for field management, which significantly improves +// Deprecated: NewClientset replaces this with support for field management, which significantly improves // server side apply testing. NewClientset is only available when apply configurations are generated (e.g. // via --with-applyconfig). func NewSimpleClientset(objects ...runtime.Object) *Clientset { @@ -52,8 +52,8 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset { cs.AddReactor("*", "*", testing.ObjectReaction(o)) cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { var opts metav1.ListOptions - if watchActcion, ok := action.(testing.WatchActionImpl); ok { - opts = watchActcion.ListOptions + if watchAction, ok := action.(testing.WatchActionImpl); ok { + opts = watchAction.ListOptions } gvr := action.GetResource() ns := action.GetNamespace() @@ -84,6 +84,17 @@ func (c *Clientset) Tracker() testing.ObjectTracker { return c.tracker } +// IsWatchListSemanticsSupported informs the reflector that this client +// doesn't support WatchList semantics. +// +// This is a synthetic method whose sole purpose is to satisfy the optional +// interface check performed by the reflector. +// Returning true signals that WatchList can NOT be used. +// No additional logic is implemented here. +func (c *Clientset) IsWatchListSemanticsUnSupported() bool { + return true +} + var ( _ clientset.Interface = &Clientset{} _ testing.FakeClient = &Clientset{} diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go index 9d417ae344..174434449c 100644 --- a/pkg/cmd/bind.go +++ b/pkg/cmd/bind.go @@ -21,6 +21,7 @@ import ( "encoding/json" "errors" "fmt" + "maps" "strings" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -280,7 +281,7 @@ func showPipeOutput(cmd *cobra.Command, binding *v1.Pipe, outputFormat string, s } func (o *bindCmdOptions) parseErrorHandler() (*v1.ErrorHandlerSpec, error) { - errHandlMap := make(map[string]interface{}) + errHandlMap := make(map[string]any) errHandlType, errHandlValue, err := parseErrorHandlerByType(o.ErrorHandler) if err != nil { return nil, err @@ -295,7 +296,7 @@ func (o *bindCmdOptions) parseErrorHandler() (*v1.ErrorHandlerSpec, error) { if err != nil { return nil, err } - errHandlMap["sink"] = map[string]interface{}{ + errHandlMap["sink"] = map[string]any{ "endpoint": sinkSpec, } default: @@ -352,12 +353,8 @@ func (o *bindCmdOptions) decode(res string, key string) (v1.Endpoint, error) { } if len(embeddedProps) > 0 { allProps := make(map[string]string) - for k, v := range explicitProps { - allProps[k] = v - } - for k, v := range embeddedProps { - allProps[k] = v - } + maps.Copy(allProps, explicitProps) + maps.Copy(allProps, embeddedProps) props, err := o.asEndpointProperties(allProps) if err != nil { diff --git a/pkg/cmd/dump.go b/pkg/cmd/dump.go index ed3aac87dd..5eaed6d141 100644 --- a/pkg/cmd/dump.go +++ b/pkg/cmd/dump.go @@ -198,7 +198,7 @@ func dumpNamespace(ctx context.Context, c client.Client, ns string, out io.Write fmt.Fprintf(out, "name=%s\n", pod.Name) dumpConditions(" ", pod.Status.Conditions, out) fmt.Fprintf(out, " logs:\n") - var allContainers []v1.Container + allContainers := make([]v1.Container, 0, len(pod.Spec.InitContainers)+len(pod.Spec.Containers)) allContainers = append(allContainers, pod.Spec.InitContainers...) allContainers = append(allContainers, pod.Spec.Containers...) for _, container := range allContainers { diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go index 246eeb50a8..bd27047627 100644 --- a/pkg/cmd/modeline.go +++ b/pkg/cmd/modeline.go @@ -22,6 +22,7 @@ import ( "errors" "fmt" "path/filepath" + "slices" "strings" "github.com/apache/camel-k/v2/pkg/cmd/source" @@ -154,12 +155,8 @@ func createKamelWithModelineCommand(ctx context.Context, args []string) (*cobra. paramAlreadySpecifiedByUser := false if o.Name == "property" || o.Name == "trait" || o.Name == "build-property" { paramComponents := strings.Split(o.Value, "=") - for _, paramName := range cliParamNames { - if paramName == paramComponents[0] { - paramAlreadySpecifiedByUser = true - - break - } + if slices.Contains(cliParamNames, paramComponents[0]) { + paramAlreadySpecifiedByUser = true } } diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go index 8fe19053c7..94e0632344 100644 --- a/pkg/cmd/operator/operator.go +++ b/pkg/cmd/operator/operator.go @@ -122,7 +122,7 @@ func Run(healthPort, monitoringPort int32, leaderElection bool, leaderElectionID klog.SetLogger(log.AsLogger()) - _, err := maxprocs.Set(maxprocs.Logger(func(f string, a ...interface{}) { log.Info(fmt.Sprintf(f, a)) })) + _, err := maxprocs.Set(maxprocs.Logger(func(f string, a ...any) { log.Info(fmt.Sprintf(f, a)) })) if err != nil { log.Error(err, "failed to set GOMAXPROCS from cgroups") } @@ -185,11 +185,11 @@ func Run(healthPort, monitoringPort int32, leaderElection bool, leaderElectionID &batchv1.Job{}: selector, } - if ok, err := kubernetes.IsAPIResourceInstalled(bootstrapClient, servingv1.SchemeGroupVersion.String(), reflect.TypeOf(servingv1.Service{}).Name()); ok && err == nil { + if ok, err := kubernetes.IsAPIResourceInstalled(bootstrapClient, servingv1.SchemeGroupVersion.String(), reflect.TypeFor[servingv1.Service]().Name()); ok && err == nil { selectors[&servingv1.Service{}] = selector } - if ok, err := kubernetes.IsAPIResourceInstalled(bootstrapClient, batchv1.SchemeGroupVersion.String(), reflect.TypeOf(batchv1.CronJob{}).Name()); ok && err == nil { + if ok, err := kubernetes.IsAPIResourceInstalled(bootstrapClient, batchv1.SchemeGroupVersion.String(), reflect.TypeFor[batchv1.CronJob]().Name()); ok && err == nil { selectors[&batchv1.CronJob{}] = selector } diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go index 136ba484e0..4371298b62 100644 --- a/pkg/cmd/root.go +++ b/pkg/cmd/root.go @@ -250,18 +250,18 @@ func (command *RootCmdOptions) NewCmdClient() (client.Client, error) { return client.NewOutOfClusterClient(command.KubeConfig) } -func (command *RootCmdOptions) PrintVerboseOut(cmd *cobra.Command, a ...interface{}) { +func (command *RootCmdOptions) PrintVerboseOut(cmd *cobra.Command, a ...any) { if command.Verbose { fmt.Fprintln(cmd.OutOrStdout(), a...) } } -func (command *RootCmdOptions) PrintfVerboseOutf(cmd *cobra.Command, format string, a ...interface{}) { +func (command *RootCmdOptions) PrintfVerboseOutf(cmd *cobra.Command, format string, a ...any) { if command.Verbose { fmt.Fprintf(cmd.OutOrStdout(), format, a...) } } -func (command *RootCmdOptions) PrintfVerboseErrf(cmd *cobra.Command, format string, a ...interface{}) { +func (command *RootCmdOptions) PrintfVerboseErrf(cmd *cobra.Command, format string, a ...any) { if command.Verbose { fmt.Fprintf(cmd.ErrOrStderr(), format, a...) } diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go index 9c9149c649..662ca4a820 100644 --- a/pkg/cmd/run.go +++ b/pkg/cmd/run.go @@ -467,12 +467,20 @@ func (o *runCmdOptions) waitForIntegrationReady(cmd *cobra.Command, c client.Cli func (o *runCmdOptions) syncIntegration(cmd *cobra.Command, c client.Client, sources []string) error { // Let's watch all relevant files when in dev mode - var files []string + res := filterFileLocation(o.Resources) + cfg := filterFileLocation(o.Configs) + prop := filterFileLocation(o.Properties) + buildProp := filterFileLocation(o.BuildProperties) + + files := make([]string, 0, + len(sources)+len(res)+len(cfg)+len(prop)+len(buildProp), + ) + files = append(files, sources...) - files = append(files, filterFileLocation(o.Resources)...) - files = append(files, filterFileLocation(o.Configs)...) - files = append(files, filterFileLocation(o.Properties)...) - files = append(files, filterFileLocation(o.BuildProperties)...) + files = append(files, res...) + files = append(files, cfg...) + files = append(files, prop...) + files = append(files, buildProp...) for _, s := range files { ok, err := source.IsLocalAndFileExists(s) diff --git a/pkg/cmd/run_support.go b/pkg/cmd/run_support.go index 1491a80a05..acc35e58cb 100644 --- a/pkg/cmd/run_support.go +++ b/pkg/cmd/run_support.go @@ -43,6 +43,7 @@ func addDependency(cmd *cobra.Command, it *v1.Integration, dependency string, ca func parseConfig(ctx context.Context, cmd *cobra.Command, c client.Client, config *resource.Config, integration *v1.Integration) error { switch config.StorageType() { case resource.StorageTypeConfigmap: + //nolint:staticcheck cm := kubernetes.LookupConfigmap(ctx, c, integration.Namespace, config.Name()) if cm == nil { fmt.Fprintln(cmd.ErrOrStderr(), "Warn:", config.Name(), "Configmap not found in", integration.Namespace, "namespace, make sure to provide it before the Integration can run") @@ -50,6 +51,7 @@ func parseConfig(ctx context.Context, cmd *cobra.Command, c client.Client, confi return errors.New("you cannot provide a binary config, use a text file instead") } case resource.StorageTypeSecret: + //nolint:staticcheck secret := kubernetes.LookupSecret(ctx, c, integration.Namespace, config.Name()) if secret == nil { fmt.Fprintln(cmd.ErrOrStderr(), "Warn:", config.Name(), "Secret not found in", integration.Namespace, "namespace, make sure to provide it before the Integration can run") @@ -111,7 +113,7 @@ func loadPropertiesFromConfigMap(ctx context.Context, c client.Client, ns string } // Deprecated: func supporting other deprecated funcs. -func fromMapToProperties(data interface{}, toString func(reflect.Value) string, loadProperties func(reflect.Value) (*properties.Properties, error)) (*properties.Properties, error) { +func fromMapToProperties(data any, toString func(reflect.Value) string, loadProperties func(reflect.Value) (*properties.Properties, error)) (*properties.Properties, error) { result := properties.NewProperties() m := reflect.ValueOf(data) for _, k := range m.MapKeys() { diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go index 397cb419ed..aeb19181a8 100644 --- a/pkg/cmd/util.go +++ b/pkg/cmd/util.go @@ -114,17 +114,17 @@ func pathToRoot(cmd *cobra.Command) string { return path } -func decodeKey(target interface{}, key string, settings map[string]any) error { - nodes := strings.Split(key, ".") +func decodeKey(target any, key string, settings map[string]any) error { + nodes := strings.SplitSeq(key, ".") - for _, node := range nodes { + for node := range nodes { v := settings[node] if v == nil { return nil } - if m, ok := v.(map[string]interface{}); ok { + if m, ok := v.(map[string]any); ok { settings = m } else { return fmt.Errorf("unable to find node %s", node) @@ -154,7 +154,7 @@ func decodeKey(target interface{}, key string, settings map[string]any) error { return nil } -func decode(target interface{}, v *viper.Viper) func(*cobra.Command, []string) error { +func decode(target any, v *viper.Viper) func(*cobra.Command, []string) error { return func(cmd *cobra.Command, args []string) error { path := pathToRoot(cmd) if err := decodeKey(target, path, v.AllSettings()); err != nil { @@ -166,7 +166,7 @@ func decode(target interface{}, v *viper.Viper) func(*cobra.Command, []string) e } func stringToSliceHookFunc(comma rune) mapstructure.DecodeHookFunc { - return func(f reflect.Kind, t reflect.Kind, data interface{}) (interface{}, error) { + return func(f reflect.Kind, t reflect.Kind, data any) (any, error) { if f != reflect.String || t != reflect.Slice { return data, nil } @@ -191,7 +191,7 @@ func stringToSliceHookFunc(comma rune) mapstructure.DecodeHookFunc { } } -func cmdOnly(cmd *cobra.Command, options interface{}) *cobra.Command { +func cmdOnly(cmd *cobra.Command, options any) *cobra.Command { return cmd } @@ -199,7 +199,7 @@ func isOfflineCommand(cmd *cobra.Command) bool { return cmd.Annotations[offlineCommandLabel] == "true" } -func clone(dst interface{}, src interface{}) error { +func clone(dst any, src any) error { if dst == nil { return errors.New("dst cannot be nil") } diff --git a/pkg/cmd/util_config.go b/pkg/cmd/util_config.go index d2669a77e9..7051350f08 100644 --- a/pkg/cmd/util_config.go +++ b/pkg/cmd/util_config.go @@ -18,6 +18,7 @@ limitations under the License. package cmd import ( + "maps" "os" "path/filepath" "reflect" @@ -51,7 +52,7 @@ const ( // Config is a helper class to manipulate kamel configuration files. type Config struct { location string - content map[string]interface{} + content map[string]any } // LoadConfiguration loads a kamel configuration file. @@ -62,7 +63,7 @@ func LoadConfiguration() (*Config, error) { func loadConfiguration(location string) (*Config, error) { config := Config{ location: location, - content: make(map[string]interface{}), + content: make(map[string]any), } if config.location == "" { @@ -87,8 +88,8 @@ func loadConfiguration(location string) (*Config, error) { } // Update ---. -func (cfg *Config) Update(cmd *cobra.Command, nodeID string, data interface{}, changedOnly bool) { - values := make(map[string]interface{}) +func (cfg *Config) Update(cmd *cobra.Command, nodeID string, data any, changedOnly bool) { + values := make(map[string]any) pl := p.NewClient() val := reflect.ValueOf(data).Elem() @@ -123,13 +124,11 @@ func (cfg *Config) Update(cmd *cobra.Command, nodeID string, data interface{}, c } // SetNode allows to replace a subtree with a given content. -func (cfg *Config) SetNode(nodeID string, nodeValues map[string]interface{}) { +func (cfg *Config) SetNode(nodeID string, nodeValues map[string]any) { cfg.Delete(nodeID) node := cfg.navigate(cfg.content, nodeID, true) - for k, v := range nodeValues { - node[k] = v - } + maps.Copy(node, nodeValues) } // Delete allows to remove a sub tree from the kamel content. @@ -157,30 +156,30 @@ func (cfg *Config) Save() error { return os.WriteFile(cfg.location, data, io.FilePerm600) } -func (cfg *Config) navigate(values map[string]interface{}, prefix string, create bool) map[string]interface{} { - nodes := strings.Split(prefix, ".") +func (cfg *Config) navigate(values map[string]any, prefix string, create bool) map[string]any { + nodes := strings.SplitSeq(prefix, ".") - for _, node := range nodes { + for node := range nodes { v := values[node] if v == nil { if create { - v = make(map[string]interface{}) + v = make(map[string]any) values[node] = v } else { return nil } } - if m, ok := v.(map[string]interface{}); ok { + if m, ok := v.(map[string]any); ok { values = m - } else if mg, ok := v.(map[interface{}]interface{}); ok { + } else if mg, ok := v.(map[any]any); ok { converted := cfg.convert(mg) values[node] = converted values = converted } else { if create { - child := make(map[string]interface{}) + child := make(map[string]any) values[node] = child return child @@ -193,8 +192,8 @@ func (cfg *Config) navigate(values map[string]interface{}, prefix string, create return values } -func (cfg *Config) convert(m map[interface{}]interface{}) map[string]interface{} { - res := make(map[string]interface{}) +func (cfg *Config) convert(m map[any]any) map[string]any { + res := make(map[string]any) for k, v := range m { if ks, ok := k.(string); ok { res[ks] = v diff --git a/pkg/controller/build/build_monitor.go b/pkg/controller/build/build_monitor.go index 44705e3aab..7166f6a093 100644 --- a/pkg/controller/build/build_monitor.go +++ b/pkg/controller/build/build_monitor.go @@ -43,7 +43,7 @@ type Monitor struct { func (bm *Monitor) canSchedule(ctx context.Context, c ctrl.Reader, build *v1.Build) (bool, *v1.BuildCondition, error) { var runningBuildsTotal int32 - runningBuilds.Range(func(_, v interface{}) bool { + runningBuilds.Range(func(_, v any) bool { runningBuildsTotal++ return true diff --git a/pkg/controller/build/build_pod.go b/pkg/controller/build/build_pod.go index 46da6b91fa..49e7d9408e 100644 --- a/pkg/controller/build/build_pod.go +++ b/pkg/controller/build/build_pod.go @@ -48,6 +48,7 @@ func newBuildPod(ctx context.Context, client client.Client, build *v1.Build) *co } for _, task := range build.Spec.Tasks { // get pod security context from security context constraint configuration in namespace + //nolint:staticcheck if task.S2i != nil { podSecurityContextConstrained, _ := openshift.GetOpenshiftPodSecurityContextRestricted(ctx, client, build.BuilderPodNamespace()) if podSecurityContextConstrained != nil { @@ -91,6 +92,7 @@ func newBuildPod(ctx context.Context, client client.Client, build *v1.Build) *co // It's a type of builder task, we can reuse the same type case task.Package != nil: addBuildTaskToPod(ctx, client, build, task.Package.Name, pod) + //nolint:staticcheck case task.S2i != nil: addBuildTaskToPod(ctx, client, build, task.S2i.Name, pod) case task.Jib != nil: diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go index 3983d80cf6..4cd1e8dd2f 100644 --- a/pkg/controller/build/monitor_pod.go +++ b/pkg/controller/build/monitor_pod.go @@ -200,7 +200,7 @@ func (action *monitorPodAction) isPodScheduled(pod *corev1.Pod) bool { } func (action *monitorPodAction) sigterm(ctx context.Context, pod *corev1.Pod) error { - var containers []corev1.ContainerStatus + containers := make([]corev1.ContainerStatus, 0, len(pod.Status.InitContainerStatuses)+len(pod.Status.ContainerStatuses)) containers = append(containers, pod.Status.InitContainerStatuses...) containers = append(containers, pod.Status.ContainerStatuses...) @@ -283,7 +283,7 @@ func (action *monitorPodAction) patchPod(ctx context.Context, pod *corev1.Pod, m func (action *monitorPodAction) getTerminatedTime(pod *corev1.Pod) metav1.Time { var finishedAt metav1.Time - var containers []corev1.ContainerStatus + containers := make([]corev1.ContainerStatus, 0, len(pod.Status.InitContainerStatuses)+len(pod.Status.ContainerStatuses)) containers = append(containers, pod.Status.InitContainerStatuses...) containers = append(containers, pod.Status.ContainerStatuses...) @@ -302,7 +302,7 @@ func (action *monitorPodAction) getTerminatedTime(pod *corev1.Pod) metav1.Time { // setConditionsFromTerminationMessages sets a condition for all those containers which have been terminated (successfully or not). func (action *monitorPodAction) setConditionsFromTerminationMessages(ctx context.Context, pod *corev1.Pod, buildStatus *v1.BuildStatus) { - var containers []corev1.ContainerStatus + containers := make([]corev1.ContainerStatus, 0, len(pod.Status.InitContainerStatuses)+len(pod.Status.ContainerStatuses)) containers = append(containers, pod.Status.InitContainerStatuses...) containers = append(containers, pod.Status.ContainerStatuses...) @@ -360,6 +360,7 @@ func publishTaskName(tasks []v1.Task) string { return t.Custom.Name case t.Jib != nil: return t.Jib.Name + //nolint:staticcheck case t.S2i != nil: return t.S2i.Name } diff --git a/pkg/controller/build/monitor_routine.go b/pkg/controller/build/monitor_routine.go index 11e5840821..663eefbe48 100644 --- a/pkg/controller/build/monitor_routine.go +++ b/pkg/controller/build/monitor_routine.go @@ -147,7 +147,7 @@ tasks: break tasks } t.BuildDir = buildDir - } else if t := task.S2i; t != nil && t.ContextDir == "" { + } else if t := task.S2i; t != nil && t.ContextDir == "" { //nolint:staticcheck if buildDir == "" { status.Failed(fmt.Errorf("cannot determine context directory for task %s", t.Name)) diff --git a/pkg/controller/integration/health.go b/pkg/controller/integration/health.go index b9904560fb..e1a1490aee 100644 --- a/pkg/controller/integration/health.go +++ b/pkg/controller/integration/health.go @@ -33,7 +33,7 @@ import ( ) const ( - // The key used for propagating error details from Camel health to MicroProfile Health + // HealthCheckErrorMessage key used for propagating error details from Camel health to MicroProfile Health // (See CAMEL-17138). HealthCheckErrorMessage = "error.message" ) diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go index 96777000ed..51d1c7ae3d 100644 --- a/pkg/controller/integration/integration_controller.go +++ b/pkg/controller/integration/integration_controller.go @@ -310,11 +310,11 @@ func add(ctx context.Context, mgr manager.Manager, c client.Client, r reconcile. // Watch for all the resources watchIntegrationResources(c, b) // Watch for the CronJob conditionally - if ok, err := kubernetes.IsAPIResourceInstalled(c, batchv1.SchemeGroupVersion.String(), reflect.TypeOf(batchv1.CronJob{}).Name()); ok && err == nil { + if ok, err := kubernetes.IsAPIResourceInstalled(c, batchv1.SchemeGroupVersion.String(), reflect.TypeFor[batchv1.CronJob]().Name()); ok && err == nil { watchCronJobResources(b) } // Watch for the Knative Services conditionally - if ok, err := kubernetes.IsAPIResourceInstalled(c, servingv1.SchemeGroupVersion.String(), reflect.TypeOf(servingv1.Service{}).Name()); err != nil { + if ok, err := kubernetes.IsAPIResourceInstalled(c, servingv1.SchemeGroupVersion.String(), reflect.TypeFor[servingv1.Service]().Name()); err != nil { return err } else if ok { if err = watchKnativeResources(ctx, c, b); err != nil { @@ -419,7 +419,7 @@ func watchCronJobResources(b *builder.Builder) { func watchKnativeResources(ctx context.Context, c client.Client, b *builder.Builder) error { // Watch for the owned Knative Services conditionally - ok, err := kubernetes.IsAPIResourceInstalled(c, servingv1.SchemeGroupVersion.String(), reflect.TypeOf(servingv1.Service{}).Name()) + ok, err := kubernetes.IsAPIResourceInstalled(c, servingv1.SchemeGroupVersion.String(), reflect.TypeFor[servingv1.Service]().Name()) if err != nil { return err } diff --git a/pkg/controller/integration/kits.go b/pkg/controller/integration/kits.go index bb26982df2..4868cd12e7 100644 --- a/pkg/controller/integration/kits.go +++ b/pkg/controller/integration/kits.go @@ -49,7 +49,7 @@ func lookupKitsForIntegration(ctx context.Context, c client.Client, integration return nil, err } - listOptions := []ctrl.ListOption{ + defaultListOptions := []ctrl.ListOption{ ctrl.InNamespace(integration.GetIntegrationKitNamespace(pl)), ctrl.MatchingLabels{ kubernetes.CamelLabelRuntimeVersion: integration.Status.RuntimeVersion, @@ -59,6 +59,8 @@ func lookupKitsForIntegration(ctx context.Context, c client.Client, integration Selector: labels.NewSelector().Add(*kitTypes), }, } + listOptions := make([]ctrl.ListOption, 0, len(defaultListOptions)+len(options)) + listOptions = append(listOptions, defaultListOptions...) listOptions = append(listOptions, options...) list := v1.NewIntegrationKitList() diff --git a/pkg/controller/integration/monitor.go b/pkg/controller/integration/monitor.go index 1f42b38124..fc316f59e1 100644 --- a/pkg/controller/integration/monitor.go +++ b/pkg/controller/integration/monitor.go @@ -349,7 +349,7 @@ func getIntegrationSecretAndConfigmapResourceVersions(ctx context.Context, clien configmaps := make([]string, 0) secrets := make([]string, 0) if integration.Spec.Traits.Mount != nil && ptr.Deref(integration.Spec.Traits.Mount.HotReload, false) { - mergedResources := make([]string, 0) + mergedResources := make([]string, 0, len(integration.Spec.Traits.Mount.Configs)+len(integration.Spec.Traits.Mount.Resources)) mergedResources = append(mergedResources, integration.Spec.Traits.Mount.Configs...) mergedResources = append(mergedResources, integration.Spec.Traits.Mount.Resources...) for _, c := range mergedResources { @@ -493,7 +493,7 @@ func arePodsFailingStatuses(integration *v1.Integration, pendingPods []corev1.Po } // Check pending container statuses for _, pod := range pendingPods { - var containers []corev1.ContainerStatus + containers := make([]corev1.ContainerStatus, 0, len(pod.Status.InitContainerStatuses)+len(pod.Status.ContainerStatuses)) containers = append(containers, pod.Status.InitContainerStatuses...) containers = append(containers, pod.Status.ContainerStatuses...) for _, container := range containers { @@ -511,7 +511,7 @@ func arePodsFailingStatuses(integration *v1.Integration, pendingPods []corev1.Po if pod.DeletionTimestamp != nil { continue } - var containers []corev1.ContainerStatus + containers := make([]corev1.ContainerStatus, 0, len(pod.Status.InitContainerStatuses)+len(pod.Status.ContainerStatuses)) containers = append(containers, pod.Status.InitContainerStatuses...) containers = append(containers, pod.Status.ContainerStatuses...) for _, container := range containers { diff --git a/pkg/controller/integrationplatform/monitor.go b/pkg/controller/integrationplatform/monitor.go index 467d3b4ed6..693d034162 100644 --- a/pkg/controller/integrationplatform/monitor.go +++ b/pkg/controller/integrationplatform/monitor.go @@ -86,7 +86,7 @@ func (action *monitorAction) Handle(ctx context.Context, platform *v1.Integratio return platform, err } //nolint: nestif - if isOpenshift && platform.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyS2I { + if isOpenshift && platform.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyS2I { //nolint:staticcheck platform.Status.SetCondition( v1.IntegrationPlatformConditionTypeRegistryAvailable, corev1.ConditionFalse, diff --git a/pkg/controller/pipe/error_handler.go b/pkg/controller/pipe/error_handler.go index b1db983a55..793b453451 100644 --- a/pkg/controller/pipe/error_handler.go +++ b/pkg/controller/pipe/error_handler.go @@ -122,22 +122,22 @@ func setErrorHandlerConfiguration(errorHandlerBinding *bindings.Binding, errorHa } // translateCamelErrorHandler will translate a binding as an error handler YAML as expected by Camel. -func translateCamelErrorHandler(b *bindings.Binding) map[string]interface{} { - yamlCode := map[string]interface{}{} +func translateCamelErrorHandler(b *bindings.Binding) map[string]any { + yamlCode := map[string]any{} switch b.URI { case "": - yamlCode["errorHandler"] = map[string]interface{}{ - "noErrorHandler": map[string]interface{}{}, + yamlCode["errorHandler"] = map[string]any{ + "noErrorHandler": map[string]any{}, } case defaultCamelErrorHandler: - yamlCode["errorHandler"] = map[string]interface{}{ - "defaultErrorHandler": map[string]interface{}{ + yamlCode["errorHandler"] = map[string]any{ + "defaultErrorHandler": map[string]any{ "logName": "err", }, } default: - yamlCode["errorHandler"] = map[string]interface{}{ - "deadLetterChannel": map[string]interface{}{ + yamlCode["errorHandler"] = map[string]any{ + "deadLetterChannel": map[string]any{ "deadLetterUri": b.URI, }, } diff --git a/pkg/controller/pipe/initialize.go b/pkg/controller/pipe/initialize.go index e01f9d8572..9d917e6456 100644 --- a/pkg/controller/pipe/initialize.go +++ b/pkg/controller/pipe/initialize.go @@ -20,6 +20,7 @@ package pipe import ( "context" "fmt" + "maps" "strings" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -133,9 +134,7 @@ func findIcon(ctx context.Context, c client.Client, pipe *v1.Pipe) (string, erro func patchPipeIconAnnotations(ctx context.Context, c client.Client, pipe *v1.Pipe, icon string) error { clone := pipe.DeepCopy() clone.Annotations = make(map[string]string) - for k, v := range pipe.Annotations { - clone.Annotations[k] = v - } + maps.Copy(clone.Annotations, pipe.Annotations) if _, ok := clone.Annotations[v1.AnnotationIcon]; !ok { clone.Annotations[v1.AnnotationIcon] = icon } diff --git a/pkg/controller/pipe/integration.go b/pkg/controller/pipe/integration.go index 2e8bad0c36..1b7b362883 100644 --- a/pkg/controller/pipe/integration.go +++ b/pkg/controller/pipe/integration.go @@ -186,7 +186,7 @@ func CreateIntegrationFor(ctx context.Context, c client.Client, pipe *v1.Pipe) ( }) } - dslSteps := make([]map[string]interface{}, 0) + dslSteps := make([]map[string]any, 0) if from.Step != nil { dslSteps = append(dslSteps, from.AsYamlDSL()) @@ -199,17 +199,17 @@ func CreateIntegrationFor(ctx context.Context, c client.Client, pipe *v1.Pipe) ( if to.Step != nil { dslSteps = append(dslSteps, to.AsYamlDSL()) } - dslSteps = append(dslSteps, map[string]interface{}{ + dslSteps = append(dslSteps, map[string]any{ "to": to.URI, }) - fromWrapper := map[string]interface{}{ + fromWrapper := map[string]any{ "uri": from.URI, "steps": dslSteps, } - flowRoute := map[string]interface{}{ - "route": map[string]interface{}{ + flowRoute := map[string]any{ + "route": map[string]any{ "id": "binding", "from": fromWrapper, }, @@ -244,6 +244,7 @@ func configureBinding(integration *v1.Integration, bindings ...*bindings.Binding if b == nil { continue } + //nolint:staticcheck if err := integration.Spec.Traits.Merge(b.Traits); err != nil { return err } diff --git a/pkg/controller/synthetic/synthetic.go b/pkg/controller/synthetic/synthetic.go index 48176f99ab..ba2a694b32 100644 --- a/pkg/controller/synthetic/synthetic.go +++ b/pkg/controller/synthetic/synthetic.go @@ -55,7 +55,7 @@ func ManageSyntheticIntegrations(ctx context.Context, c client.Client, cache cac } for _, informer := range informers { _, err := informer.AddEventHandler(clientgocache.ResourceEventHandlerFuncs{ - AddFunc: func(obj interface{}) { + AddFunc: func(obj any) { ctrlObj, ok := obj.(ctrl.Object) if !ok { log.Error(fmt.Errorf("type assertion failed: %v", obj), "Failed to retrieve Object on add event") @@ -68,7 +68,7 @@ func ManageSyntheticIntegrations(ctx context.Context, c client.Client, cache cac onAdd(ctx, c, ctrlObj) }, - DeleteFunc: func(obj interface{}) { + DeleteFunc: func(obj any) { ctrlObj, ok := obj.(ctrl.Object) if !ok { log.Errorf(fmt.Errorf("type assertion failed: %v", obj), "Failed to retrieve Object on delete event") @@ -134,7 +134,7 @@ func getInformers(ctx context.Context, cl client.Client, c cache.Cache) ([]cache } informers := []cache.Informer{deploy} // Watch for the CronJob conditionally - if ok, err := kubernetes.IsAPIResourceInstalled(cl, batchv1.SchemeGroupVersion.String(), reflect.TypeOf(batchv1.CronJob{}).Name()); ok && err == nil { + if ok, err := kubernetes.IsAPIResourceInstalled(cl, batchv1.SchemeGroupVersion.String(), reflect.TypeFor[batchv1.CronJob]().Name()); ok && err == nil { cron, err := c.GetInformer(ctx, &batchv1.CronJob{}) if err != nil { return nil, err @@ -142,7 +142,7 @@ func getInformers(ctx context.Context, cl client.Client, c cache.Cache) ([]cache informers = append(informers, cron) } // Watch for the Knative Services conditionally - if ok, err := kubernetes.IsAPIResourceInstalled(cl, servingv1.SchemeGroupVersion.String(), reflect.TypeOf(servingv1.Service{}).Name()); ok && err == nil { + if ok, err := kubernetes.IsAPIResourceInstalled(cl, servingv1.SchemeGroupVersion.String(), reflect.TypeFor[servingv1.Service]().Name()); ok && err == nil { if ok, err := kubernetes.CheckSelfPermission(ctx, cl, serving.GroupName, "services", platform.GetOperatorWatchNamespace(), "", "watch"); ok && err == nil { ksvc, err := c.GetInformer(ctx, &servingv1.Service{}) if err != nil { diff --git a/pkg/install/openshift.go b/pkg/install/openshift.go index 3d2a0c7a2c..c133fb18c6 100644 --- a/pkg/install/openshift.go +++ b/pkg/install/openshift.go @@ -61,7 +61,7 @@ var ( func OpenShiftConsoleDownloadLink(ctx context.Context, c client.Client) error { // Check the ConsoleCLIDownload CRD is present, which should be starting OpenShift version 4.2. // That check is also enough to exclude Kubernetes clusters. - ok, err := kubernetes.IsAPIResourceInstalled(c, "console.openshift.io/v1", reflect.TypeOf(console.ConsoleCLIDownload{}).Name()) + ok, err := kubernetes.IsAPIResourceInstalled(c, "console.openshift.io/v1", reflect.TypeFor[console.ConsoleCLIDownload]().Name()) if err != nil { return err } else if !ok { diff --git a/pkg/internal/client.go b/pkg/internal/client.go index 7e345fce01..0d788ec47f 100644 --- a/pkg/internal/client.go +++ b/pkg/internal/client.go @@ -20,6 +20,7 @@ package internal import ( "context" "fmt" + "slices" "strings" "github.com/apache/camel-k/v2/pkg/apis" @@ -74,9 +75,11 @@ func NewFakeClient(initObjs ...runtime.Object) (client.Client, error) { WithStatusSubresource(&v1.IntegrationKit{}). Build() + //nolint:staticcheck camelClientset := fakecamelclientset.NewSimpleClientset(filterObjects(scheme, initObjs, func(gvk schema.GroupVersionKind) bool { return strings.Contains(gvk.Group, "camel") })...) + //nolint:staticcheck clientset := fakeclientset.NewSimpleClientset(filterObjects(scheme, initObjs, func(gvk schema.GroupVersionKind) bool { return !strings.Contains(gvk.Group, "camel") && !strings.Contains(gvk.Group, "knative") })...) @@ -135,12 +138,8 @@ func filterObjects(scheme *runtime.Scheme, input []runtime.Object, filter func(g var res []runtime.Object for _, obj := range input { kinds, _, _ := scheme.ObjectKinds(obj) - for _, k := range kinds { - if filter(k) { - res = append(res, obj) - - break - } + if slices.ContainsFunc(kinds, filter) { + res = append(res, obj) } } @@ -256,7 +255,7 @@ func (f *FakeAuthorization) SelfSubjectRulesReviews() authorizationv1.SelfSubjec return f.AuthorizationV1Interface.SelfSubjectRulesReviews() } -// Returns a fake SAR interface. +// SubjectAccessReviews returns a fake SAR interface. func (f *FakeAuthorization) SubjectAccessReviews() authorizationv1.SubjectAccessReviewInterface { return &FakeSAR{} } @@ -265,7 +264,7 @@ type FakeSAR struct { authorizationv1.SubjectAccessReviewInterface } -// Fake Create implementation (needed in cross namespace Kamelets test). Only allow `cross-ns-sa` user in `default` namespace. +// Create fake create implementation (needed in cross namespace Kamelets test). Only allow `cross-ns-sa` user in `default` namespace. func (f *FakeSAR) Create(ctx context.Context, sar *authv1.SubjectAccessReview, opts metav1.CreateOptions) (*authv1.SubjectAccessReview, error) { ra := sar.Spec.ResourceAttributes allowed := sar.Spec.User == "system:serviceaccount:default:cross-ns-sa" && ra.Verb == "get" && ra.Resource == "kamelets" diff --git a/pkg/kamelet/repository/repository.go b/pkg/kamelet/repository/repository.go index feadce57a3..29b6009d29 100644 --- a/pkg/kamelet/repository/repository.go +++ b/pkg/kamelet/repository/repository.go @@ -132,8 +132,8 @@ func getRepositoriesFromPlatform(platform *v1.IntegrationPlatform) []string { func newFromURI(ctx context.Context, uri string) (KameletRepository, error) { if uri == NoneRepository { return newEmptyKameletRepository(), nil - } else if strings.HasPrefix(uri, "github:") { - desc := strings.TrimPrefix(uri, "github:") + } else if after, ok := strings.CutPrefix(uri, "github:"); ok { + desc := after var version string if strings.Contains(desc, "@") { pos := strings.LastIndex(desc, "@") diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go index 87a2ca1dcd..b5a52482c3 100644 --- a/pkg/platform/defaults.go +++ b/pkg/platform/defaults.go @@ -105,6 +105,7 @@ func ConfigureDefaults(ctx context.Context, c client.Client, p *v1.IntegrationPl return err } + //nolint:staticcheck if verbose && p.Status.Build.PublishStrategy != v1.IntegrationPlatformBuildPublishStrategyS2I && p.Status.Build.Registry.Address == "" { log.Log.Info("No registry specified for publishing images") } @@ -117,6 +118,7 @@ func ConfigureDefaults(ctx context.Context, c client.Client, p *v1.IntegrationPl } func configureRegistry(ctx context.Context, c client.Client, p *v1.IntegrationPlatform) error { + //nolint:staticcheck if p.Status.Cluster == v1.IntegrationPlatformClusterOpenShift && p.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyS2I && p.Status.Build.Registry.Address == "" { diff --git a/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml b/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml index 2cd20e16b3..3d093181d0 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_builds.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: builds.camel.apache.org spec: group: camel.apache.org @@ -87,6 +87,7 @@ spec: configuration: description: |- The configuration that should be used to perform the Build. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility properties: annotations: @@ -146,13 +147,15 @@ spec: type: object maxRunningBuilds: description: |- - the maximum amount of parallel running builds started by this operator instance + the maximum amount of parallel running builds started by this operator instance. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility format: int32 type: integer operatorNamespace: description: |- The namespace where to run the builder Pod (must be the same of the operator in charge of this Build reconciliation). + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility type: string tasks: @@ -163,7 +166,8 @@ spec: properties: buildah: description: |- - a BuildahTask, for Buildah strategy + a BuildahTask, for Buildah strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -845,7 +849,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -893,7 +898,8 @@ spec: properties: command: description: |- - the command to execute + the command to execute. + Deprecated: use ContainerCommands type: string commands: @@ -1076,7 +1082,8 @@ spec: type: object kaniko: description: |- - a KanikoTask, for Kaniko strategy + a KanikoTask, for Kaniko strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -1767,7 +1774,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -1811,7 +1819,8 @@ spec: type: object s2i: description: |- - a S2iTask, for S2I strategy + a S2iTask, for S2I strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -1914,7 +1923,8 @@ spec: type: object spectrum: description: |- - a SpectrumTask, for Spectrum strategy + a SpectrumTask, for Spectrum strategy. + Deprecated: use jib or a custom publishing strategy instead properties: baseImage: @@ -2025,6 +2035,7 @@ spec: toolImage: description: |- The container image to be used to run the build. + Deprecated: no longer in use in Camel K 2 - maintained for backward compatibility type: string type: object diff --git a/pkg/resources/config/crd/bases/camel.apache.org_camelcatalogs.yaml b/pkg/resources/config/crd/bases/camel.apache.org_camelcatalogs.yaml index 0a31324951..50ba8fbb15 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_camelcatalogs.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_camelcatalogs.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: camelcatalogs.camel.apache.org spec: group: camel.apache.org diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml index 2b7c504881..1bf4da1d3c 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: integrationkits.camel.apache.org spec: group: camel.apache.org @@ -98,6 +98,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -163,7 +164,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -228,6 +230,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -241,11 +244,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -286,11 +291,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -339,7 +346,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -348,6 +356,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -395,6 +404,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -418,10 +428,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -432,11 +444,13 @@ spec: registry: description: |- 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: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml index dec9e1fdb5..79c2711be6 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: integrationplatforms.camel.apache.org spec: group: camel.apache.org @@ -105,7 +105,8 @@ spec: type: string buildCatalogToolTimeout: description: |- - the timeout (in seconds) to use when creating the build tools container image + the timeout (in seconds) to use when creating the build tools container image. + Deprecated: no longer in use type: string buildConfiguration: @@ -464,6 +465,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -535,6 +537,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -589,6 +592,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -602,11 +606,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -647,11 +653,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -700,7 +708,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -709,6 +718,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -762,6 +772,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -895,6 +906,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -928,6 +940,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -941,6 +954,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -949,9 +963,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -967,6 +982,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1016,6 +1032,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1042,12 +1059,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1065,12 +1084,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -1108,6 +1129,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1153,6 +1175,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1299,6 +1322,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1317,6 +1341,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -1349,6 +1374,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1380,6 +1406,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1395,7 +1422,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -1415,6 +1443,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1494,6 +1523,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1524,7 +1554,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -1538,6 +1569,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1573,6 +1605,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1665,6 +1698,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1774,6 +1808,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1828,6 +1863,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1863,6 +1899,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1909,6 +1946,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1952,7 +1990,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -1964,6 +2003,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1977,6 +2017,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2001,6 +2042,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2030,6 +2072,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2045,12 +2088,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2065,6 +2110,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2093,6 +2139,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2130,6 +2177,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2153,10 +2201,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -2167,11 +2217,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2182,7 +2234,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -2197,6 +2250,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2286,6 +2340,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2325,6 +2380,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2340,6 +2396,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -2363,12 +2420,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2402,6 +2461,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2435,6 +2495,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2478,7 +2539,8 @@ spec: type: string buildCatalogToolTimeout: description: |- - the timeout (in seconds) to use when creating the build tools container image + the timeout (in seconds) to use when creating the build tools container image. + Deprecated: no longer in use type: string buildConfiguration: @@ -2871,6 +2933,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -2956,6 +3019,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3010,6 +3074,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3023,11 +3088,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -3068,11 +3135,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -3121,7 +3190,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -3130,6 +3200,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3183,6 +3254,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3316,6 +3388,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3349,6 +3422,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3362,6 +3436,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3370,9 +3445,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -3388,6 +3464,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3437,6 +3514,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3463,12 +3541,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3486,12 +3566,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -3529,6 +3611,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3574,6 +3657,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3720,6 +3804,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3738,6 +3823,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -3770,6 +3856,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3801,6 +3888,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3816,7 +3904,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -3836,6 +3925,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3915,6 +4005,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3945,7 +4036,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -3959,6 +4051,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3994,6 +4087,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4086,6 +4180,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4195,6 +4290,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4249,6 +4345,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4284,6 +4381,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4330,6 +4428,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4373,7 +4472,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -4385,6 +4485,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4398,6 +4499,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4422,6 +4524,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4451,6 +4554,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4466,12 +4570,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4486,6 +4592,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4514,6 +4621,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4551,6 +4659,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4574,10 +4683,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -4588,11 +4699,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4603,7 +4716,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -4618,6 +4732,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4707,6 +4822,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4746,6 +4862,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4761,6 +4878,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -4784,12 +4902,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4823,6 +4943,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4856,6 +4977,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml index e2e672585a..a41a345464 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: integrationprofiles.camel.apache.org spec: group: camel.apache.org @@ -403,6 +403,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -457,6 +458,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -470,11 +472,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -515,11 +519,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -568,7 +574,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -577,6 +584,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -630,6 +638,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -763,6 +772,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -796,6 +806,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -809,6 +820,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -817,9 +829,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -835,6 +848,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -884,6 +898,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -910,12 +925,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -933,12 +950,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -976,6 +995,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1021,6 +1041,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1167,6 +1188,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1185,6 +1207,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -1217,6 +1240,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1248,6 +1272,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1263,7 +1288,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -1283,6 +1309,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1362,6 +1389,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1392,7 +1420,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -1406,6 +1435,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1441,6 +1471,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1533,6 +1564,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1642,6 +1674,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1696,6 +1729,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1731,6 +1765,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1777,6 +1812,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1820,7 +1856,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -1832,6 +1869,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1845,6 +1883,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1869,6 +1908,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1898,6 +1938,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1913,12 +1954,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1933,6 +1976,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1961,6 +2005,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -1998,6 +2043,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2021,10 +2067,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -2035,11 +2083,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2050,7 +2100,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -2065,6 +2116,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2154,6 +2206,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2193,6 +2246,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2208,6 +2262,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -2231,12 +2286,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2270,6 +2327,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2303,6 +2361,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2703,6 +2762,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2757,6 +2817,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2770,11 +2831,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -2815,11 +2878,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -2868,7 +2933,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -2877,6 +2943,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -2930,6 +2997,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3063,6 +3131,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3096,6 +3165,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3109,6 +3179,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3117,9 +3188,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -3135,6 +3207,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3184,6 +3257,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3210,12 +3284,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3233,12 +3309,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -3276,6 +3354,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3321,6 +3400,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3467,6 +3547,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3485,6 +3566,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -3517,6 +3599,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3548,6 +3631,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3563,7 +3647,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -3583,6 +3668,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3662,6 +3748,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3692,7 +3779,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -3706,6 +3794,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3741,6 +3830,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3833,6 +3923,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3942,6 +4033,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -3996,6 +4088,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4031,6 +4124,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4077,6 +4171,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4120,7 +4215,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -4132,6 +4228,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4145,6 +4242,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4169,6 +4267,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4198,6 +4297,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4213,12 +4313,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4233,6 +4335,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4261,6 +4364,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4298,6 +4402,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4321,10 +4426,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -4335,11 +4442,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4350,7 +4459,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -4365,6 +4475,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4454,6 +4565,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4493,6 +4605,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4508,6 +4621,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -4531,12 +4645,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4570,6 +4686,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -4603,6 +4720,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml index c88edef296..bb1aebbb05 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: integrations.camel.apache.org spec: group: camel.apache.org @@ -93,6 +93,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -235,7 +236,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -273,9 +275,9 @@ spec: type: array template: description: |- - Pod template customization - Deprecated: - Use container, init-containers or owner traits instead + Pod template customization. + + Deprecated: use container, init-containers or owner traits instead properties: spec: description: the specification @@ -1167,7 +1169,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -4210,7 +4214,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -5878,7 +5884,7 @@ spec: resources: description: |- resources represents the minimum resources the volume should have. - If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements + Users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources @@ -6764,6 +6770,24 @@ spec: description: Kubelet's generated CSRs will be addressed to this signer. type: string + userAnnotations: + additionalProperties: + type: string + description: |- + userAnnotations allow pod authors to pass additional information to + the signer implementation. Kubernetes does not restrict or validate this + metadata in any way. + + These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of + the PodCertificateRequest objects that Kubelet creates. + + Entries are subject to the same validation as object metadata annotations, + with the addition that all keys must be domain-prefixed. No restrictions + are placed on values, except an overall size limitation on the entire field. + + Signers should document the keys and values they support. Signers should + deny requests that contain keys they do not recognize. + type: object required: - keyType - signerName @@ -7217,6 +7241,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7271,6 +7296,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7284,11 +7310,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -7329,11 +7357,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -7382,7 +7412,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -7391,6 +7422,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7444,6 +7476,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7577,6 +7610,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7610,6 +7644,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7623,6 +7658,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7631,9 +7667,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -7649,6 +7686,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7698,6 +7736,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7724,12 +7763,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7747,12 +7788,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -7790,6 +7833,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7835,6 +7879,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7981,6 +8026,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7999,6 +8045,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -8031,6 +8078,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8062,6 +8110,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8077,7 +8126,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -8097,6 +8147,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8176,6 +8227,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8206,7 +8258,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -8220,6 +8273,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8255,6 +8309,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8347,6 +8402,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8456,6 +8512,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8510,6 +8567,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8545,6 +8603,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8591,6 +8650,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8634,7 +8694,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -8646,6 +8707,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8659,6 +8721,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8683,6 +8746,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8712,6 +8776,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8727,12 +8792,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8747,6 +8814,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8775,6 +8843,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8812,6 +8881,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8835,10 +8905,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -8849,11 +8921,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8864,7 +8938,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -8879,6 +8954,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8968,6 +9044,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9007,6 +9084,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9022,6 +9100,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -9045,12 +9124,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9084,6 +9165,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9117,6 +9199,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9208,7 +9291,7 @@ spec: observedGeneration: description: |- If set, this represents the .metadata.generation that the pod condition was set based upon. - This is an alpha field. Enable PodObservedGenerationTracking to be able to use this field. + The PodObservedGenerationTracking feature gate must be enabled to use this field. format: int64 type: integer reason: @@ -9267,8 +9350,9 @@ spec: type: array configuration: description: |- - Deprecated: - a list of configuration specification + a list of configuration specification. + + Deprecated: use properties instead. items: description: ConfigurationSpec represents a generic configuration specification. @@ -9321,7 +9405,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -9471,6 +9556,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9525,6 +9611,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9538,11 +9625,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -9583,11 +9672,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -9636,7 +9727,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -9645,6 +9737,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9698,6 +9791,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9831,6 +9925,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9864,6 +9959,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9877,6 +9973,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9885,9 +9982,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -9903,6 +10001,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9952,6 +10051,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9978,12 +10078,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10001,12 +10103,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -10044,6 +10148,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10089,6 +10194,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10235,6 +10341,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10253,6 +10360,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -10285,6 +10393,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10316,6 +10425,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10331,7 +10441,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -10351,6 +10462,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10430,6 +10542,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10460,7 +10573,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -10474,6 +10588,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10509,6 +10624,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10601,6 +10717,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10710,6 +10827,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10764,6 +10882,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10799,6 +10918,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10845,6 +10965,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10888,7 +11009,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -10900,6 +11022,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10913,6 +11036,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10937,6 +11061,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10966,6 +11091,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10981,12 +11107,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11001,6 +11129,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11029,6 +11158,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11066,6 +11196,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11089,10 +11220,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -11103,11 +11236,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11118,7 +11253,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -11133,6 +11269,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11222,6 +11359,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11261,6 +11399,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11276,6 +11415,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -11299,12 +11439,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11338,6 +11480,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11371,6 +11514,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true diff --git a/pkg/resources/config/crd/bases/camel.apache.org_kamelets.yaml b/pkg/resources/config/crd/bases/camel.apache.org_kamelets.yaml index ae0bb302aa..04dd819206 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_kamelets.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_kamelets.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: kamelets.camel.apache.org spec: group: camel.apache.org @@ -461,7 +461,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -1042,7 +1043,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string diff --git a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml index 975a1eca2d..b2325b12c8 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml @@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.19.0 + controller-gen.kubebuilder.io/version: v0.20.0 name: pipes.camel.apache.org spec: group: camel.apache.org @@ -89,6 +89,7 @@ spec: configuration: description: |- Deprecated: + Use camel trait (camel.properties) to manage properties Use mount trait (mount.configs) to manage configs Use mount trait (mount.resources) to manage resources @@ -231,7 +232,8 @@ spec: interceptors: description: |- Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader - uses to pre/post process sources + uses to pre/post process sources. + Deprecated: no longer in use. items: type: string @@ -269,9 +271,9 @@ spec: type: array template: description: |- - Pod template customization - Deprecated: - Use container, init-containers or owner traits instead + Pod template customization. + + Deprecated: use container, init-containers or owner traits instead properties: spec: description: the specification @@ -1172,7 +1174,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -4241,7 +4245,9 @@ spec: type: integer type: object resizePolicy: - description: Resources resize policy for the container. + description: |- + Resources resize policy for the container. + This field cannot be set on ephemeral containers. items: description: ContainerResizePolicy represents resource resize policy for the container. @@ -5915,7 +5921,7 @@ spec: resources: description: |- resources represents the minimum resources the volume should have. - If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements + Users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources @@ -6812,6 +6818,24 @@ spec: description: Kubelet's generated CSRs will be addressed to this signer. type: string + userAnnotations: + additionalProperties: + type: string + description: |- + userAnnotations allow pod authors to pass additional information to + the signer implementation. Kubernetes does not restrict or validate this + metadata in any way. + + These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of + the PodCertificateRequest objects that Kubelet creates. + + Entries are subject to the same validation as object metadata annotations, + with the addition that all keys must be domain-prefixed. No restrictions + are placed on values, except an overall size limitation on the entire field. + + Signers should document the keys and values they support. Signers should + deny requests that contain keys they do not recognize. + type: object required: - keyType - signerName @@ -7269,6 +7293,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7323,6 +7348,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7336,11 +7362,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -7382,11 +7410,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -7435,7 +7465,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -7444,6 +7475,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7499,6 +7531,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7632,6 +7665,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7665,6 +7699,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7678,6 +7713,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7686,9 +7722,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -7704,6 +7741,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7753,6 +7791,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7779,12 +7818,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7802,12 +7843,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -7845,6 +7888,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -7890,6 +7934,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8036,6 +8081,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8054,6 +8100,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -8086,6 +8133,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8118,6 +8166,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8133,7 +8182,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -8153,6 +8203,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8232,6 +8283,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8262,7 +8314,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -8276,6 +8329,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8311,6 +8365,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8404,6 +8459,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8513,6 +8569,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8567,6 +8624,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8602,6 +8660,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8649,6 +8708,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8692,7 +8752,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -8704,6 +8765,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8717,6 +8779,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8741,6 +8804,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8770,6 +8834,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8785,12 +8850,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8805,6 +8872,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8833,6 +8901,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8871,6 +8940,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8894,10 +8964,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -8908,11 +8980,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -8923,7 +8997,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -8938,6 +9013,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9027,6 +9103,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9066,6 +9143,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9081,6 +9159,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -9104,12 +9183,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9143,6 +9224,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9177,6 +9259,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9459,6 +9542,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9513,6 +9597,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9526,11 +9611,13 @@ spec: limitCPU: description: |- When using `pod` strategy, the maximum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string limitMemory: description: |- When using `pod` strategy, the maximum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string mavenProfiles: @@ -9571,11 +9658,13 @@ spec: requestCPU: description: |- When using `pod` strategy, the minimum amount of CPU required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string requestMemory: description: |- When using `pod` strategy, the minimum amount of memory required by the pod builder. + Deprecated: use TasksRequestCPU instead with task name `builder`. type: string strategy: @@ -9624,7 +9713,8 @@ spec: verbose: description: |- Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Deprecated no longer in use + + Deprecated: no longer in use type: boolean type: object camel: @@ -9633,6 +9723,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9686,6 +9777,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9819,6 +9911,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9852,6 +9945,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9865,6 +9959,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9873,9 +9968,10 @@ spec: type: boolean kind: description: |- - Deprecated: this feature will be removed in future releases. Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. + + Deprecated: this feature will be removed in future releases. enum: - deployment - cron-job @@ -9891,6 +9987,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9940,6 +10037,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9966,12 +10064,14 @@ spec: type: object error-handler: description: |- - The configuration of Error Handler trait + The configuration of Error Handler trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -9989,12 +10089,14 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). + Deprecated: no longer in use. enum: - disabled @@ -10032,6 +10134,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10077,6 +10180,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10223,6 +10327,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10241,6 +10346,7 @@ spec: path: description: |- To configure the path exposed by the ingress (default `/`). + Deprecated: In favor of `paths` - left for backward compatibility. type: string pathType: @@ -10273,6 +10379,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10304,6 +10411,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10319,7 +10427,8 @@ spec: type: object jolokia: description: |- - The configuration of Jolokia trait + The configuration of Jolokia trait. + Deprecated: use jvm.agent instead. properties: CACert: @@ -10339,6 +10448,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10418,6 +10528,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10448,7 +10559,8 @@ spec: type: array printCommand: description: |- - Prints the command used the start the JVM in the container logs (default `true`) + Prints the command used the start the JVM in the container logs (default `true`). + Deprecated: no longer in use. type: boolean type: object @@ -10462,6 +10574,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10497,6 +10610,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10589,6 +10703,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10698,6 +10813,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10752,6 +10868,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10787,6 +10904,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10833,6 +10951,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10876,7 +10995,8 @@ spec: type: object openapi: description: |- - The configuration of OpenAPI trait + The configuration of OpenAPI trait. + Deprecated: no longer in use. properties: configmaps: @@ -10888,6 +11008,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10901,6 +11022,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10925,6 +11047,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10954,6 +11077,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10969,12 +11093,14 @@ spec: type: object pod: description: |- - The configuration of Pod trait + The configuration of Pod trait. + Deprecated: use init-containers instead. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -10989,6 +11115,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11017,6 +11144,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11054,6 +11182,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11077,10 +11206,12 @@ spec: The order influences the resolution of the current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. + Deprecated: use `build-mode` instead. items: description: |- QuarkusPackageType is the type of Quarkus build packaging. + Deprecated: use `QuarkusMode` instead. enum: - fast-jar @@ -11091,11 +11222,13 @@ spec: registry: description: |- The configuration of Registry trait (support removed since version 2.5.0). + Deprecated: use jvm trait or read documentation. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11106,7 +11239,8 @@ spec: type: object route: description: |- - The configuration of Route trait + The configuration of Route trait. + Deprecated: use ingress instead. properties: annotations: @@ -11121,6 +11255,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11210,6 +11345,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11249,6 +11385,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11264,6 +11401,7 @@ spec: nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). + Deprecated: Use service type instead. type: boolean ports: @@ -11287,12 +11425,14 @@ spec: type: object service-binding: description: |- - The configuration of Service Binding trait + The configuration of Service Binding trait. + Deprecated: no longer in use. properties: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11326,6 +11466,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11359,6 +11500,7 @@ spec: configuration: description: |- Legacy trait configuration parameters. + Deprecated: for backward compatibility. type: object x-kubernetes-preserve-unknown-fields: true @@ -11431,7 +11573,7 @@ spec: observedGeneration: description: |- If set, this represents the .metadata.generation that the pod condition was set based upon. - This is an alpha field. Enable PodObservedGenerationTracking to be able to use this field. + The PodObservedGenerationTracking feature gate must be enabled to use this field. format: int64 type: integer reason: diff --git a/pkg/resources/resources_support.go b/pkg/resources/resources_support.go index 55f2afdf13..c702684b29 100644 --- a/pkg/resources/resources_support.go +++ b/pkg/resources/resources_support.go @@ -63,7 +63,7 @@ func ResourceAsString(name string) (string, error) { } // TemplateResource loads a file resource as go template and processes it using the given parameters. -func TemplateResource(name string, params interface{}) (string, error) { +func TemplateResource(name string, params any) (string, error) { rawData, err := ResourceAsString(name) if err != nil { return "", err diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go index ed616e4bb5..0ae5229a84 100644 --- a/pkg/trait/builder.go +++ b/pkg/trait/builder.go @@ -162,6 +162,7 @@ func existsTaskRequest(tasks []string, taskName string) bool { return false } +//nolint:staticcheck func (t *builderTrait) adaptDeprecatedFields() *TraitCondition { var condition *TraitCondition if t.RequestCPU != "" { @@ -279,7 +280,7 @@ func (t *builderTrait) Apply(e *Environment) error { jibTask.Jib.Configuration.ImagePlatforms = t.ImagePlatforms } pipelineTasks = append(pipelineTasks, jibTask) - + //nolint:staticcheck case v1.IntegrationPlatformBuildPublishStrategyS2I: pipelineTasks = append(pipelineTasks, v1.Task{S2i: &v1.S2iTask{ BaseTask: v1.BaseTask{ @@ -369,7 +370,7 @@ func (t *builderTrait) builderTask(e *Environment, taskConf *v1.BuildConfigurati } } if !found { - var strategies []string + strategies := make([]string, 0, len(v1.BuildStrategies)) for _, s := range v1.BuildStrategies { strategies = append(strategies, string(s)) } @@ -454,7 +455,7 @@ func (t *builderTrait) builderTask(e *Environment, taskConf *v1.BuildConfigurati task.Maven.Profiles = mavenProfiles } - steps := make([]builder.Step, 0) + steps := make([]builder.Step, 0, len(builder.Project.CommonSteps)) steps = append(steps, builder.Project.CommonSteps...) // sort steps by phase @@ -659,6 +660,7 @@ func filter(tasks []v1.Task, filterTasks []string) ([]v1.Task, error) { case t.Package != nil && t.Package.Name == f: filteredTasks = append(filteredTasks, t) found = true + //nolint:staticcheck case t.S2i != nil && t.S2i.Name == f: filteredTasks = append(filteredTasks, t) found = true diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go index 20743248f8..7e07d91096 100644 --- a/pkg/trait/camel.go +++ b/pkg/trait/camel.go @@ -21,6 +21,7 @@ import ( "errors" "fmt" "strconv" + "strings" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -235,17 +236,21 @@ func (t *camelTrait) computeUserProperties(e *Environment) []ctrl.Object { // properties have the priority userProperties := "" + var userPropertiesSb238 strings.Builder for _, prop := range e.collectConfigurationPairs("property") { // properties in resource configuration are expected to be pre-encoded using properties format - userProperties += fmt.Sprintf("%s=%s\n", prop.Name, prop.Value) + userPropertiesSb238.WriteString(fmt.Sprintf("%s=%s\n", prop.Name, prop.Value)) } + userProperties += userPropertiesSb238.String() if t.Properties != nil { // Merge with properties set in the trait + var userPropertiesSb245 strings.Builder for _, prop := range t.Properties { k, v := property.SplitPropertyFileEntry(prop) - userProperties += fmt.Sprintf("%s=%s\n", k, v) + userPropertiesSb245.WriteString(fmt.Sprintf("%s=%s\n", k, v)) } + userProperties += userPropertiesSb245.String() } if userProperties != "" { diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go index 96448ab19e..7c8abe1525 100644 --- a/pkg/trait/cron.go +++ b/pkg/trait/cron.go @@ -20,6 +20,7 @@ package trait import ( "errors" "fmt" + "maps" "regexp" "strconv" "strings" @@ -235,9 +236,7 @@ func (t *cronTrait) Apply(e *Environment) error { func (t *cronTrait) getCronJobFor(e *Environment) *batchv1.CronJob { annotations := make(map[string]string) if e.Integration.Annotations != nil { - for k, v := range filterTransferableAnnotations(e.Integration.Annotations) { - annotations[k] = v - } + maps.Copy(annotations, filterTransferableAnnotations(e.Integration.Annotations)) } // Set the default container annotation for kubectl commands diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go index 4d3d65ba05..2c5ff764b7 100644 --- a/pkg/trait/deployment.go +++ b/pkg/trait/deployment.go @@ -18,6 +18,8 @@ limitations under the License. package trait import ( + "maps" + "k8s.io/apimachinery/pkg/util/intstr" appsv1 "k8s.io/api/apps/v1" @@ -113,9 +115,7 @@ func (t *deploymentTrait) getDeploymentFor(e *Environment) *appsv1.Deployment { // create a copy to avoid sharing the underlying annotation map annotations := make(map[string]string) if e.Integration.Annotations != nil { - for k, v := range filterTransferableAnnotations(e.Integration.Annotations) { - annotations[k] = v - } + maps.Copy(annotations, filterTransferableAnnotations(e.Integration.Annotations)) } // Set the default container annotation for kubectl commands diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index d3d8f39c24..0b3e64d9e8 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -217,7 +217,7 @@ func (t *gcTrait) garbageCollectResources(e *Environment) error { func (t *gcTrait) deleteEachOf(ctx context.Context, deletableGVKs map[schema.GroupVersionKind]struct{}, e *Environment, selector labels.Selector) error { for GVK := range deletableGVKs { resources := unstructured.UnstructuredList{ - Object: map[string]interface{}{ + Object: map[string]any{ "apiVersion": GVK.GroupVersion().String(), "kind": GVK.Kind, }, diff --git a/pkg/trait/ingress.go b/pkg/trait/ingress.go index 1605377b58..8291fea398 100644 --- a/pkg/trait/ingress.go +++ b/pkg/trait/ingress.go @@ -78,6 +78,7 @@ func (t *ingressTrait) Configure(e *Environment) (bool, *TraitCondition, error) } } + //nolint:staticcheck if t.Path != "" { m := "The path parameter is deprecated and may be removed in a future release. Use the paths parameter instead." t.L.Info(m) @@ -168,6 +169,7 @@ func (t *ingressTrait) getPaths(service *corev1.Service) []networkingv1.HTTPIngr } paths := []networkingv1.HTTPIngressPath{} + //nolint:staticcheck if t.Path == "" && len(t.Paths) == 0 { paths = append(paths, createIngressPath(defaultPath)) } else { diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go index cefb926779..d7c01a9cb9 100644 --- a/pkg/trait/jvm.go +++ b/pkg/trait/jvm.go @@ -217,7 +217,7 @@ func getClasspath(depsDirs *sets.Set, jvmTraitClasspath string) string { func getClasspathSet(cps string) *sets.Set { s := sets.NewSet() - for _, cp := range strings.Split(cps, ":") { + for cp := range strings.SplitSeq(cps, ":") { s.Add(cp) } diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go index 78f659bbc6..9728623712 100644 --- a/pkg/trait/kamelets.go +++ b/pkg/trait/kamelets.go @@ -119,7 +119,7 @@ func (t *kameletsTrait) collectKamelets(e *Environment) (map[string]*v1.Kamelet, var availableKamelets []string var bundledKamelets []string - for _, kml := range strings.Split(t.List, ",") { + for kml := range strings.SplitSeq(t.List, ",") { name := getKameletKey(kml) if !v1.ValidKameletName(name) { // Skip kamelet sink and source id @@ -354,7 +354,7 @@ func (t *kameletsTrait) addKameletAsSource(e *Environment, kamelet *v1.Kamelet) func (t *kameletsTrait) getKameletKeys() []string { answer := make([]string, 0) - for _, item := range strings.Split(t.List, ",") { + for item := range strings.SplitSeq(t.List, ",") { i := getKameletKey(item) if i != "" && v1.ValidKameletName(i) { util.StringSliceUniqueAdd(&answer, i) diff --git a/pkg/trait/keda.go b/pkg/trait/keda.go index e00d2f754c..66074e4b80 100644 --- a/pkg/trait/keda.go +++ b/pkg/trait/keda.go @@ -19,6 +19,7 @@ package trait import ( "fmt" + "maps" "strings" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -181,9 +182,7 @@ func (t *kedaTrait) autoDiscoverTriggers(e *Environment) error { // Merge additional metadata if configured if t.AutoMetadata != nil { if extra, ok := t.AutoMetadata[trigger.Type]; ok { - for k, v := range extra { - trigger.Metadata[k] = v - } + maps.Copy(trigger.Metadata, extra) } } t.Triggers = append(t.Triggers, *trigger) diff --git a/pkg/trait/keda/uri_parser.go b/pkg/trait/keda/uri_parser.go index b12204ccdd..9043474a1d 100644 --- a/pkg/trait/keda/uri_parser.go +++ b/pkg/trait/keda/uri_parser.go @@ -36,9 +36,9 @@ func ParseComponentURI(rawURI string) (string, string, map[string]string, error) // extract path remainder := strings.TrimPrefix(rawURI, scheme+":") var pathValue string - if idx := strings.Index(remainder, "?"); idx >= 0 { - pathValue = remainder[:idx] - queryString := remainder[idx+1:] + if before, after, ok := strings.Cut(remainder, "?"); ok { + pathValue = before + queryString := after values, parseErr := url.ParseQuery(queryString) if parseErr != nil { diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go index 9d1233e7d5..12bc9f6945 100644 --- a/pkg/trait/knative.go +++ b/pkg/trait/knative.go @@ -20,6 +20,7 @@ package trait import ( "errors" "fmt" + "maps" "net/url" "reflect" "sort" @@ -141,7 +142,6 @@ func (t *knativeTrait) Configure(e *Environment) (bool, *TraitCondition, error) } func filterMetaItems(meta metadata.IntegrationMetadata, cst knativeapi.CamelServiceType, uriType string) []string { - items := make([]string, 0) var uris []string switch uriType { case "from": @@ -149,7 +149,9 @@ func filterMetaItems(meta metadata.IntegrationMetadata, cst knativeapi.CamelServ case "to": uris = meta.ToURIs } - items = append(items, knativeutil.FilterURIs(uris, cst)...) + filtered := knativeutil.FilterURIs(uris, cst) + items := make([]string, 0, len(filtered)) + items = append(items, filtered...) if len(items) == 0 { return nil } @@ -193,9 +195,7 @@ func (t *knativeTrait) Apply(e *Environment) error { if e.ApplicationProperties == nil { e.ApplicationProperties = make(map[string]string) } - for k, v := range env.ToCamelProperties() { - e.ApplicationProperties[k] = v - } + maps.Copy(e.ApplicationProperties, env.ToCamelProperties()) return nil } diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go index afe7a612a8..224f5b1cbf 100644 --- a/pkg/trait/knative_service.go +++ b/pkg/trait/knative_service.go @@ -19,6 +19,7 @@ package trait import ( "errors" + "maps" "strconv" corev1 "k8s.io/api/core/v1" @@ -173,25 +174,19 @@ func (t *knativeServiceTrait) ControllerStrategySelectorOrder() int { func (t *knativeServiceTrait) getServiceFor(e *Environment) (*serving.Service, error) { serviceAnnotations := make(map[string]string) if e.Integration.Annotations != nil { - for k, v := range e.Integration.Annotations { - serviceAnnotations[k] = v - } + maps.Copy(serviceAnnotations, e.Integration.Annotations) } // Set Knative rollout if t.RolloutDuration != "" { serviceAnnotations[knativeServingRolloutDurationAnnotation] = t.RolloutDuration } if t.Annotations != nil { - for k, v := range t.Annotations { - serviceAnnotations[k] = v - } + maps.Copy(serviceAnnotations, t.Annotations) } revisionAnnotations := make(map[string]string) if e.Integration.Annotations != nil { - for k, v := range filterTransferableAnnotations(e.Integration.Annotations) { - revisionAnnotations[k] = v - } + maps.Copy(revisionAnnotations, filterTransferableAnnotations(e.Integration.Annotations)) } // Set the default container annotation for kubectl diff --git a/pkg/trait/master.go b/pkg/trait/master.go index 9ac75e7809..8bd60a9388 100644 --- a/pkg/trait/master.go +++ b/pkg/trait/master.go @@ -191,7 +191,7 @@ func findAdditionalDependencies(e *Environment, meta metadata.IntegrationMetadat return dependencies } -func loadResource(cli client.Client, name string, params interface{}) (ctrl.Object, error) { +func loadResource(cli client.Client, name string, params any) (ctrl.Object, error) { data, err := resources.TemplateResource("resources/addons/master/"+name, params) if err != nil { return nil, err diff --git a/pkg/trait/pod.go b/pkg/trait/pod.go index 1eef5948a3..3b8ba94004 100644 --- a/pkg/trait/pod.go +++ b/pkg/trait/pod.go @@ -53,6 +53,7 @@ func (t *podTrait) Configure(e *Environment) (bool, *TraitCondition, error) { if !ptr.Deref(t.Enabled, true) { return false, NewIntegrationConditionUserDisabled("Pod"), nil } + //nolint:staticcheck if e.Integration.Spec.PodTemplate == nil { return false, nil, nil } @@ -69,6 +70,7 @@ func (t *podTrait) Configure(e *Environment) (bool, *TraitCondition, error) { } func (t *podTrait) Apply(e *Environment) error { + //nolint:staticcheck changes := e.Integration.Spec.PodTemplate.Spec var patchedPodSpec *corev1.PodSpec strategy, err := e.DetermineControllerStrategy() diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go index cd526c9386..080e5e5d44 100644 --- a/pkg/trait/quarkus.go +++ b/pkg/trait/quarkus.go @@ -19,6 +19,7 @@ package trait import ( "fmt" + "slices" "sort" "github.com/rs/xid" @@ -172,6 +173,7 @@ func (t *quarkusTrait) Configure(e *Environment) (bool, *TraitCondition, error) condition, nil } +//nolint:staticcheck func (t *quarkusTrait) adaptDeprecatedFields() *TraitCondition { if t.PackageTypes != nil { message := "The package-type parameter is deprecated and may be removed in future releases. Make sure to use mode parameter instead." @@ -477,13 +479,7 @@ func (t *quarkusTrait) isEmbedded(e *Environment, source v1.SourceSpec) bool { } func (t *quarkusTrait) containsMode(m traitv1.QuarkusMode) bool { - for _, mode := range t.Modes { - if mode == m { - return true - } - } - - return false + return slices.Contains(t.Modes, m) } func packageType(mode traitv1.QuarkusMode) quarkusPackageType { diff --git a/pkg/trait/route.go b/pkg/trait/route.go index 464c3c165a..54c76c90c7 100644 --- a/pkg/trait/route.go +++ b/pkg/trait/route.go @@ -216,6 +216,7 @@ func (t *routeTrait) readContentIfExists(e *Environment, secretName string) (str key = strs[1] } + //nolint:staticcheck secret := kubernetes.LookupSecret(e.Ctx, t.Client, t.service.Namespace, secretName) if secret == nil { return "", fmt.Errorf("%s secret not found in %s namespace, make sure to provide it before the Integration can run", secretName, t.service.Namespace) diff --git a/pkg/trait/service.go b/pkg/trait/service.go index 3912906425..fcfcfb3c0f 100644 --- a/pkg/trait/service.go +++ b/pkg/trait/service.go @@ -19,6 +19,7 @@ package trait import ( "fmt" + "maps" "strconv" "strings" @@ -131,7 +132,7 @@ func (t *serviceTrait) Apply(e *Environment) error { default: return fmt.Errorf("unsupported service type: %s", *t.Type) } - } else if ptr.Deref(t.NodePort, false) { + } else if ptr.Deref(t.NodePort, false) { //nolint:staticcheck t.L.ForIntegration(e.Integration).Infof("Integration %s/%s should no more use the flag node-port as it is deprecated, use type instead", e.Integration.Namespace, e.Integration.Name) serviceType = corev1.ServiceTypeNodePort } @@ -146,9 +147,7 @@ func (t *serviceTrait) getServiceFor(itName, itNamespace string) *corev1.Service labels := map[string]string{ v1.IntegrationLabel: itName, } - for k, v := range t.Labels { - labels[k] = v - } + maps.Copy(labels, t.Labels) ports := t.getServicePorts() return &corev1.Service{ diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go index 3556a96074..986931ae28 100644 --- a/pkg/trait/trait_catalog.go +++ b/pkg/trait/trait_catalog.go @@ -151,14 +151,14 @@ func (c *Catalog) apply(environment *Environment) ([]*TraitCondition, *v1.Traits func (c *Catalog) executedTraitCondition(executedTrait []Trait) (*TraitCondition, v1.Traits, error) { var traits v1.Traits - var traitMap = make(map[string]map[string]interface{}) + var traitMap = make(map[string]map[string]any) traitIds := make([]string, 0) for _, trait := range executedTrait { data, err := json.Marshal(trait) if err != nil { return nil, traits, err } - var traitIDMap map[string]interface{} + var traitIDMap map[string]any if err := json.Unmarshal(data, &traitIDMap); err != nil { return nil, traits, err } diff --git a/pkg/trait/trait_configure.go b/pkg/trait/trait_configure.go index a905b370ca..e3408e1e4a 100644 --- a/pkg/trait/trait_configure.go +++ b/pkg/trait/trait_configure.go @@ -68,7 +68,7 @@ func (c *Catalog) Configure(env *Environment) error { return nil } -func (c *Catalog) configureTraits(traits interface{}) error { +func (c *Catalog) configureTraits(traits any) error { traitMap, err := ToTraitMap(traits) if err != nil { return err @@ -83,7 +83,7 @@ func (c *Catalog) configureTraits(traits interface{}) error { return nil } -func (c *Catalog) configureTrait(id string, trait map[string]interface{}) error { +func (c *Catalog) configureTrait(id string, trait map[string]any) error { if catTrait := c.GetTrait(id); catTrait != nil { if err := decodeTrait(trait, catTrait); err != nil { return err @@ -93,7 +93,7 @@ func (c *Catalog) configureTrait(id string, trait map[string]interface{}) error return nil } -func decodeTrait(in map[string]interface{}, target Trait) error { +func decodeTrait(in map[string]any, target Trait) error { // Migrate legacy configuration properties before applying to catalog if err := MigrateLegacyConfiguration(in); err != nil { return err @@ -109,7 +109,7 @@ func decodeTrait(in map[string]interface{}, target Trait) error { // Deprecated: to be removed in future versions. func (c *Catalog) configureTraitsFromAnnotations(annotations map[string]string) error { - options := make(map[string]map[string]interface{}, len(annotations)) + options := make(map[string]map[string]any, len(annotations)) for k, v := range annotations { if !strings.HasPrefix(k, v1.TraitAnnotationPrefix) { continue @@ -124,7 +124,7 @@ func (c *Catalog) configureTraitsFromAnnotations(annotations map[string]string) id := parts[0] prop := parts[1] if _, ok := options[id]; !ok { - options[id] = make(map[string]interface{}) + options[id] = make(map[string]any) } propParts := util.ConfigTreePropertySplit(prop) @@ -134,7 +134,7 @@ func (c *Catalog) configureTraitsFromAnnotations(annotations map[string]string) if err != nil { return err } - if cc, ok := c.(map[string]interface{}); ok { + if cc, ok := c.(map[string]any); ok { current = cc } else { return errors.New(`invalid array specification: to set an array value use the ["v1", "v2"] format`) @@ -147,7 +147,7 @@ func (c *Catalog) configureTraitsFromAnnotations(annotations map[string]string) } // Deprecated: to be removed in future versions. -func (c *Catalog) configureFromOptions(traits map[string]map[string]interface{}) error { +func (c *Catalog) configureFromOptions(traits map[string]map[string]any) error { for id, config := range traits { t := c.GetTrait(id) if t != nil { @@ -162,14 +162,14 @@ func (c *Catalog) configureFromOptions(traits map[string]map[string]interface{}) } // Deprecated: to be removed in future versions. -func configureTrait(id string, config map[string]interface{}, trait interface{}) error { +func configureTrait(id string, config map[string]any, trait any) error { md := mapstructure.Metadata{} - var valueConverter mapstructure.DecodeHookFuncKind = func(sourceKind reflect.Kind, targetKind reflect.Kind, data interface{}) (interface{}, error) { + var valueConverter mapstructure.DecodeHookFuncKind = func(sourceKind reflect.Kind, targetKind reflect.Kind, data any) (any, error) { // Allow JSON encoded arrays to set slices if sourceKind == reflect.String && targetKind == reflect.Slice { if v, ok := data.(string); ok && strings.HasPrefix(v, "[") && strings.HasSuffix(v, "]") { - var value interface{} + var value any if err := json.Unmarshal([]byte(v), &value); err != nil { return nil, fmt.Errorf("could not decode JSON array for configuring trait property: %w", err) } diff --git a/pkg/trait/trait_support.go b/pkg/trait/trait_support.go index 6893f1f492..a2aa097511 100644 --- a/pkg/trait/trait_support.go +++ b/pkg/trait/trait_support.go @@ -26,7 +26,7 @@ import ( "github.com/go-viper/mapstructure/v2" ) -type optionMap map[string]map[string]interface{} +type optionMap map[string]map[string]any var traitConfigRegexp = regexp.MustCompile(`^([a-z0-9-]+)((?:\.[a-z0-9-]+)(?:\[[0-9]+\]|\..+)*)=(.*)$`) @@ -49,7 +49,7 @@ func ValidateTraits(catalog *Catalog, traits []string) error { return nil } -func ConfigureTraits(options []string, traits interface{}, catalog Finder) error { +func ConfigureTraits(options []string, traits any, catalog Finder) error { config, err := optionsToMap(options) if err != nil { return err @@ -87,7 +87,7 @@ func optionsToMap(options []string) (optionMap, error) { fullProp := parts[2][1:] value := parts[3] if _, ok := optionMap[id]; !ok { - optionMap[id] = make(map[string]interface{}) + optionMap[id] = make(map[string]any) } propParts := util.ConfigTreePropertySplit(fullProp) @@ -97,7 +97,7 @@ func optionsToMap(options []string) (optionMap, error) { if err != nil { return nil, err } - if cc, ok := c.(map[string]interface{}); ok { + if cc, ok := c.(map[string]any); ok { current = cc } else { return nil, errors.New("trait configuration cannot end with a slice") diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go index e56bb86a89..5148f29cfb 100644 --- a/pkg/trait/trait_types.go +++ b/pkg/trait/trait_types.go @@ -22,6 +22,7 @@ import ( "errors" "path/filepath" "regexp" + "slices" "sort" "strings" @@ -261,13 +262,7 @@ func (e *Environment) IntegrationInPhase(phases ...v1.IntegrationPhase) bool { return false } - for _, phase := range phases { - if e.Integration.Status.Phase == phase { - return true - } - } - - return false + return slices.Contains(phases, e.Integration.Status.Phase) } func (e *Environment) IntegrationInRunningPhases() bool { @@ -279,13 +274,7 @@ func (e *Environment) IntegrationKitInPhase(phases ...v1.IntegrationKitPhase) bo return false } - for _, phase := range phases { - if e.IntegrationKit.Status.Phase == phase { - return true - } - } - - return false + return slices.Contains(phases, e.IntegrationKit.Status.Phase) } func (e *Environment) PlatformInPhase(phases ...v1.IntegrationPlatformPhase) bool { @@ -293,13 +282,7 @@ func (e *Environment) PlatformInPhase(phases ...v1.IntegrationPlatformPhase) boo return false } - for _, phase := range phases { - if e.Platform.Status.Phase == phase { - return true - } - } - - return false + return slices.Contains(phases, e.Platform.Status.Phase) } func (e *Environment) InPhase(c v1.IntegrationKitPhase, i v1.IntegrationPhase) bool { diff --git a/pkg/trait/util.go b/pkg/trait/util.go index 81b3f30185..3ae52e27bd 100644 --- a/pkg/trait/util.go +++ b/pkg/trait/util.go @@ -22,6 +22,7 @@ import ( "encoding/json" "errors" "fmt" + "maps" "reflect" "regexp" "strings" @@ -35,9 +36,9 @@ import ( "github.com/apache/camel-k/v2/pkg/util/sets" ) -type Options map[string]map[string]interface{} +type Options map[string]map[string]any -func (u Options) Get(id string) (map[string]interface{}, bool) { +func (u Options) Get(id string) (map[string]any, bool) { if t, ok := u[id]; ok { return t, true } @@ -155,7 +156,7 @@ func ExtractSourceLoaderDependencies(source v1.SourceSpec, catalog *camel.Runtim // AssertTraitsType asserts that traits is either v1.Traits or v1.IntegrationKitTraits. // This function is provided because Go doesn't have Either nor union types. -func AssertTraitsType(traits interface{}) error { +func AssertTraitsType(traits any) error { _, ok1 := traits.(v1.Traits) _, ok2 := traits.(v1.IntegrationKitTraits) if !ok1 && !ok2 { @@ -166,7 +167,7 @@ func AssertTraitsType(traits interface{}) error { } // ToTraitMap accepts either v1.Traits or v1.IntegrationKitTraits and converts it to a map of traits. -func ToTraitMap(traits interface{}) (Options, error) { +func ToTraitMap(traits any) (Options, error) { if err := AssertTraitsType(traits); err != nil { return nil, err } @@ -186,12 +187,12 @@ func ToTraitMap(traits interface{}) (Options, error) { // MigrateLegacyConfiguration moves up the legacy configuration in a trait to the new top-level properties. // Values of the new properties always take precedence over the ones from the legacy configuration // with the same property names. -func MigrateLegacyConfiguration(trait map[string]interface{}) error { +func MigrateLegacyConfiguration(trait map[string]any) error { if trait["configuration"] == nil { return nil } - if config, ok := trait["configuration"].(map[string]interface{}); ok { + if config, ok := trait["configuration"].(map[string]any); ok { // For traits that had the same property name "configuration", // the property needs to be renamed to "config" to avoid naming conflicts // (e.g. Knative trait). @@ -214,7 +215,7 @@ func MigrateLegacyConfiguration(trait map[string]interface{}) error { } // ToTrait unmarshals a map configuration to a target trait. -func ToTrait(trait map[string]interface{}, target interface{}) error { +func ToTrait(trait map[string]any, target any) error { data, err := json.Marshal(trait) if err != nil { return err @@ -317,19 +318,18 @@ func newTraitsOptions(c client.Client, opts Options, annotations map[string]stri return nil, err } - for k, v := range m2 { - opts[k] = v - } + maps.Copy(opts, m2) return opts, nil } -// ExtractAndDeleteTraits will extract the annotation traits into v1.Traits struct, removing from the value from the input map. +// ExtractAndMaybeDeleteTraits will extract the annotation traits into v1.Traits struct, removing from the value from the input map. func ExtractAndMaybeDeleteTraits(c client.Client, annotations map[string]string, del bool) (*v1.Traits, error) { // structure that will be marshalled into a v1.Traits as it was a kamel run command catalog := NewCatalog(c) traitsPlainParams := []string{} for k, v := range annotations { + //nolint:staticcheck if strings.HasPrefix(k, v1.TraitAnnotationPrefix) { key := strings.ReplaceAll(k, v1.TraitAnnotationPrefix, "") traitID := strings.Split(key, ".")[0] @@ -356,14 +356,15 @@ func ExtractAndMaybeDeleteTraits(c client.Client, annotations map[string]string, return &traits, nil } -// extractTraitValue can detect if the value is an array representation as ["prop1=1", "prop2=2"] and +// extractAsArray can detect if the value is an array representation as ["prop1=1", "prop2=2"] and // return an array with the values or with the single value passed as a parameter. func extractAsArray(value string) []string { if strings.HasPrefix(value, "[") && strings.HasSuffix(value, "]") { - arrayValue := []string{} + //nolint: prealloc // cannot prealloc as SplitSeq is an iterator + var arrayValue []string data := value[1 : len(value)-1] - vals := strings.Split(data, ",") - for _, v := range vals { + vals := strings.SplitSeq(data, ",") + for v := range vals { prop := strings.Trim(v, " ") if strings.HasPrefix(prop, `"`) && strings.HasSuffix(prop, `"`) { prop = prop[1 : len(prop)-1] @@ -401,6 +402,7 @@ func NewSpecTraitsOptionsForIntegrationAndPlatform( } // Deprecated: to remove when we remove support for traits annotations. + // // IMPORTANT: when we remove this we'll need to remove the client.Client from the func, // which will bring to more cascade removal. It had to be introduced to support the deprecated feature // in a properly manner (ie, comparing the spec.traits with annotations in a proper way). @@ -414,6 +416,7 @@ func NewSpecTraitsOptionsForIntegration(c client.Client, i *v1.Integration) (Opt } // Deprecated: to remove when we remove support for traits annotations. + // // IMPORTANT: when we remove this we'll need to remove the client.Client from the func, // which will bring to more cascade removal. It had to be introduced to support the deprecated feature // in a properly manner (ie, comparing the spec.traits with annotations in a proper way). @@ -427,6 +430,7 @@ func newTraitsOptionsForIntegrationKit(c client.Client, i *v1.IntegrationKit, tr } // Deprecated: to remove when we remove support for traits annotations. + // // IMPORTANT: when we remove this we'll need to remove the client.Client from the func, // which will bring to more cascade removal. It had to be introduced to support the deprecated feature // in a properly manner (ie, comparing the spec.traits with annotations in a proper way). @@ -478,7 +482,7 @@ func HasMatchingTraits(traitMap Options, kitTraitMap Options) (bool, error) { return true, nil } -func matchesComparableTrait(ct ComparableTrait, it map[string]interface{}, kt map[string]interface{}) (bool, error) { +func matchesComparableTrait(ct ComparableTrait, it map[string]any, kt map[string]any) (bool, error) { t1 := reflect.New(reflect.TypeOf(ct).Elem()).Interface() if err := ToTrait(it, &t1); err != nil { return false, err @@ -499,7 +503,7 @@ func matchesComparableTrait(ct ComparableTrait, it map[string]interface{}, kt ma return ct2.Matches(tt1), nil } -func matchesTrait(it map[string]interface{}, kt map[string]interface{}) bool { +func matchesTrait(it map[string]any, kt map[string]any) bool { // perform exact match on the two trait maps return reflect.DeepEqual(it, kt) } diff --git a/pkg/util/bindings/api.go b/pkg/util/bindings/api.go index 80f3d142ae..28566819ad 100644 --- a/pkg/util/bindings/api.go +++ b/pkg/util/bindings/api.go @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package bindings provides APIs to transform Kubernetes objects into Camel URIs equivalents +// Package bindings provides APIs to transform Kubernetes objects into Camel URIs equivalents. package bindings import ( @@ -37,8 +37,9 @@ type Binding struct { // URI is the Camel URI equivalent URI string // Step is to support complex mapping such as Camel's EIPs - Step map[string]interface{} - // Traits is a partial trait specification that should be merged into the integration + Step map[string]any + // Traits is a partial trait specification that should be merged into the integration. + // // Deprecated: will be removed in future releases Traits v1.Traits // ApplicationProperties contain properties that should be set on the integration for the binding to work diff --git a/pkg/util/bindings/api_support.go b/pkg/util/bindings/api_support.go index 59990a49e6..fdf0444648 100644 --- a/pkg/util/bindings/api_support.go +++ b/pkg/util/bindings/api_support.go @@ -15,16 +15,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package bindings provides APIs to transform Kubernetes objects into Camel URIs equivalents package bindings import "fmt" // AsYamlDSL construct proper Camel Yaml DSL from given binding. -func (b Binding) AsYamlDSL() map[string]interface{} { +func (b Binding) AsYamlDSL() map[string]any { step := b.Step if step == nil { - step = map[string]interface{}{ + step = map[string]any{ "to": b.URI, } } diff --git a/pkg/util/bindings/kamelet.go b/pkg/util/bindings/kamelet.go index 09ff4d8258..92b9697fee 100644 --- a/pkg/util/bindings/kamelet.go +++ b/pkg/util/bindings/kamelet.go @@ -19,6 +19,7 @@ package bindings import ( "fmt" + "maps" "net/url" "strings" @@ -98,31 +99,27 @@ func (k BindingConverter) Translate(ctx BindingContext, endpointCtx EndpointCont switch endpointCtx.Type { case v1.EndpointTypeAction: - steps := make([]map[string]interface{}, 0) + steps := make([]map[string]any, 0) if in, applicationProperties := k.DataTypeStep(e, id, v1.TypeSlotIn, dataTypeActionKamelet); in != nil { steps = append(steps, in) - for k, v := range applicationProperties { - binding.ApplicationProperties[k] = v - } + maps.Copy(binding.ApplicationProperties, applicationProperties) } - steps = append(steps, map[string]interface{}{ - "kamelet": map[string]interface{}{ + steps = append(steps, map[string]any{ + "kamelet": map[string]any{ "name": kameletTranslated, }, }) if out, applicationProperties := k.DataTypeStep(e, id, v1.TypeSlotOut, dataTypeActionKamelet); out != nil { steps = append(steps, out) - for k, v := range applicationProperties { - binding.ApplicationProperties[k] = v - } + maps.Copy(binding.ApplicationProperties, applicationProperties) } if len(steps) > 1 { - binding.Step = map[string]interface{}{ - "pipeline": map[string]interface{}{ + binding.Step = map[string]any{ + "pipeline": map[string]any{ "id": id + "-pipeline", "steps": steps, }, @@ -133,18 +130,14 @@ func (k BindingConverter) Translate(ctx BindingContext, endpointCtx EndpointCont case v1.EndpointTypeSource: if out, applicationProperties := k.DataTypeStep(e, id, v1.TypeSlotOut, dataTypeActionKamelet); out != nil { binding.Step = out - for k, v := range applicationProperties { - binding.ApplicationProperties[k] = v - } + maps.Copy(binding.ApplicationProperties, applicationProperties) } binding.URI = "kamelet:" + kameletTranslated case v1.EndpointTypeSink: if in, applicationProperties := k.DataTypeStep(e, id, v1.TypeSlotIn, dataTypeActionKamelet); in != nil { binding.Step = in - for k, v := range applicationProperties { - binding.ApplicationProperties[k] = v - } + maps.Copy(binding.ApplicationProperties, applicationProperties) } binding.URI = "kamelet:" + kameletTranslated @@ -163,7 +156,7 @@ func getKameletName(name, id, version, namespace string) string { } // DataTypeStep --. -func (k BindingConverter) DataTypeStep(e v1.Endpoint, id string, typeSlot v1.TypeSlot, dataTypeActionKamelet string) (map[string]interface{}, map[string]string) { +func (k BindingConverter) DataTypeStep(e v1.Endpoint, id string, typeSlot v1.TypeSlot, dataTypeActionKamelet string) (map[string]any, map[string]string) { if e.DataTypes == nil { return nil, nil } @@ -183,8 +176,8 @@ func (k BindingConverter) DataTypeStep(e v1.Endpoint, id string, typeSlot v1.Typ props[fmt.Sprintf("camel.kamelet.%s.%s-%s.scheme", dataTypeActionKamelet, id, typeSlot)] = scheme props[fmt.Sprintf("camel.kamelet.%s.%s-%s.format", dataTypeActionKamelet, id, typeSlot)] = format - stepDsl := map[string]interface{}{ - "kamelet": map[string]interface{}{ + stepDsl := map[string]any{ + "kamelet": map[string]any{ "name": fmt.Sprintf("%s/%s-%s", dataTypeActionKamelet, url.PathEscape(id), typeSlot), }, } diff --git a/pkg/util/bindings/strimzi.go b/pkg/util/bindings/strimzi.go index 7bfaa43314..196617eca0 100644 --- a/pkg/util/bindings/strimzi.go +++ b/pkg/util/bindings/strimzi.go @@ -40,7 +40,7 @@ type camelKafka struct { properties map[string]string } -// BindingProvider allows to connect to a Kafka topic via Binding. +// StrimziBindingProvider allows to connect to a Kafka topic via Binding. type StrimziBindingProvider struct { Client internalclientset.Interface } diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go index d43cf57950..564e064029 100644 --- a/pkg/util/digest/digest.go +++ b/pkg/util/digest/digest.go @@ -180,13 +180,13 @@ func computeForTraits(hash hash.Hash, traits v1.Traits) error { return nil } -func computeForTrait(hash hash.Hash, name string, trait map[string]interface{}) error { +func computeForTrait(hash hash.Hash, name string, trait map[string]any) error { if _, err := hash.Write([]byte(name + "[")); err != nil { return err } // hash legacy configuration first if trait["configuration"] != nil { - if config, ok := trait["configuration"].(map[string]interface{}); ok { + if config, ok := trait["configuration"].(map[string]any); ok { if err := computeForTraitProps(hash, config); err != nil { return err } @@ -203,7 +203,7 @@ func computeForTrait(hash hash.Hash, name string, trait map[string]interface{}) return nil } -func computeForTraitProps(hash hash.Hash, props map[string]interface{}) error { +func computeForTraitProps(hash hash.Hash, props map[string]any) error { for _, prop := range util.SortedMapKeys(props) { val := props[prop] if _, err := fmt.Fprintf(hash, "%s=%v,", prop, val); err != nil { @@ -214,12 +214,12 @@ func computeForTraitProps(hash hash.Hash, props map[string]interface{}) error { return nil } -func toMap(traits v1.Traits) (map[string]map[string]interface{}, error) { +func toMap(traits v1.Traits) (map[string]map[string]any, error) { data, err := json.Marshal(traits) if err != nil { return nil, err } - traitsMap := make(map[string]map[string]interface{}) + traitsMap := make(map[string]map[string]any) if err = json.Unmarshal(data, &traitsMap); err != nil { return nil, err } @@ -296,7 +296,7 @@ func ComputeForSource(s v1.SourceSpec) (string, error) { return digest, nil } -func sortedTraitsMapKeys(m map[string]map[string]interface{}) []string { +func sortedTraitsMapKeys(m map[string]map[string]any) []string { res := make([]string, len(m)) i := 0 for k := range m { diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go index ed7c9561df..3fb5138dbc 100644 --- a/pkg/util/dsl/template.go +++ b/pkg/util/dsl/template.go @@ -32,7 +32,7 @@ func TemplateToYamlDSL(template v1.Template, id string) ([]byte, error) { if err != nil { return nil, err } - jsondata := make(map[string]interface{}) + jsondata := make(map[string]any) err = json.Unmarshal(data, &jsondata) if err != nil { return nil, fmt.Errorf("error unmarshalling json: %w", err) @@ -40,9 +40,9 @@ func TemplateToYamlDSL(template v1.Template, id string) ([]byte, error) { if _, present := jsondata["id"]; !present { jsondata["id"] = id } - templateWrapper := make(map[string]interface{}, 2) + templateWrapper := make(map[string]any, 2) templateWrapper["routeTemplate"] = jsondata - listWrapper := make([]interface{}, 0, 1) + listWrapper := make([]any, 0, 1) listWrapper = append(listWrapper, templateWrapper) yamldata, err := yaml2.Marshal(listWrapper) if err != nil { diff --git a/pkg/util/gitops/gitops.go b/pkg/util/gitops/gitops.go index f4ab319a0b..3300215854 100644 --- a/pkg/util/gitops/gitops.go +++ b/pkg/util/gitops/gitops.go @@ -20,6 +20,7 @@ package util import ( "context" "errors" + "maps" "os" "path/filepath" "sort" @@ -107,7 +108,7 @@ func getClasspath(kit *v1.IntegrationKit, jvmTraitSpec *traitv1.JVMTrait) string func getClasspathSet(cps string) *sets.Set { s := sets.NewSet() - for _, cp := range strings.Split(cps, ":") { + for cp := range strings.SplitSeq(cps, ":") { s.Add(cp) } @@ -141,9 +142,7 @@ func cloneAnnotations(ann map[string]string, operatorID string) map[string]strin // Return all labels. The method is a reference if in the future we need to apply any filtering. func cloneLabels(lbs map[string]string) map[string]string { newMap := make(map[string]string) - for k, v := range lbs { - newMap[k] = v - } + maps.Copy(newMap, lbs) return newMap } diff --git a/pkg/util/jib/configuration.go b/pkg/util/jib/configuration.go index 7fb29eeb2c..f90239aef2 100644 --- a/pkg/util/jib/configuration.go +++ b/pkg/util/jib/configuration.go @@ -33,10 +33,10 @@ const JibDigestFile = "target/jib-image.digest" const JibMavenPluginVersionDefault = "3.4.1" const JibLayerFilterExtensionMavenVersionDefault = "0.3.0" -// See: https://github.com/GoogleContainerTools/jib/blob/master/jib-maven-plugin/README.md#using-docker-configuration-files +// JibRegistryConfigEnvVar -- See: https://github.com/GoogleContainerTools/jib/blob/master/jib-maven-plugin/README.md#using-docker-configuration-files. const JibRegistryConfigEnvVar = "DOCKER_CONFIG" -// The Jib profile configuration. +// XMLJibProfile is the Jib profile configuration. const XMLJibProfile = ` jib diff --git a/pkg/util/knative/knative.go b/pkg/util/knative/knative.go index 89abf3d9bc..95596ea93c 100644 --- a/pkg/util/knative/knative.go +++ b/pkg/util/knative/knative.go @@ -252,8 +252,8 @@ func EnableKnativeBindInNamespace(ctx context.Context, client client.Client, nam return false, nil } - var jsonLabelPatch = map[string]interface{}{ - "metadata": map[string]interface{}{ + var jsonLabelPatch = map[string]any{ + "metadata": map[string]any{ "labels": map[string]string{"bindings.knative.dev/include": "true"}, }, } diff --git a/pkg/util/kubernetes/camel.go b/pkg/util/kubernetes/camel.go index d0cffd459a..31f6e9a737 100644 --- a/pkg/util/kubernetes/camel.go +++ b/pkg/util/kubernetes/camel.go @@ -18,6 +18,7 @@ limitations under the License. package kubernetes import ( + "maps" "strings" corev1 "k8s.io/api/core/v1" @@ -62,9 +63,7 @@ func MergeCamelCreatorLabels(source map[string]string, target map[string]string) if target == nil { target = make(map[string]string) } - for k, v := range FilterCamelCreatorLabels(source) { - target[k] = v - } + maps.Copy(target, FilterCamelCreatorLabels(source)) return target } diff --git a/pkg/util/kubernetes/log/annotation_scraper.go b/pkg/util/kubernetes/log/annotation_scraper.go index 0044ca2038..87b8fcd2df 100644 --- a/pkg/util/kubernetes/log/annotation_scraper.go +++ b/pkg/util/kubernetes/log/annotation_scraper.go @@ -87,7 +87,7 @@ func (s *SelectorScraper) periodicSynchronize(ctx context.Context, out *bufio.Wr select { case <-ctx.Done(): // cleanup - s.podScrapers.Range(func(_, v interface{}) bool { + s.podScrapers.Range(func(_, v any) bool { if canc, isCanc := v.(context.CancelFunc); isCanc { canc() } @@ -117,7 +117,7 @@ func (s *SelectorScraper) synchronize(ctx context.Context, out *bufio.Writer) er } toBeRemoved := make(map[string]bool) - s.podScrapers.Range(func(k, _ interface{}) bool { + s.podScrapers.Range(func(k, _ any) bool { if str, isStr := k.(string); isStr { if _, ok := present[str]; !ok { toBeRemoved[str] = true diff --git a/pkg/util/kubernetes/lookup.go b/pkg/util/kubernetes/lookup.go index 86a6504a3b..a6f62c0cb7 100644 --- a/pkg/util/kubernetes/lookup.go +++ b/pkg/util/kubernetes/lookup.go @@ -30,6 +30,7 @@ import ( ) // LookupConfigmap will look for any k8s Configmap with a given name in a given namespace. +// // Deprecated: won't be supported in future releases. func LookupConfigmap(ctx context.Context, c client.Client, ns string, name string) *corev1.ConfigMap { cm := corev1.ConfigMap{ @@ -66,6 +67,7 @@ func LookupResourceVersion(ctx context.Context, c client.Client, object ctrl.Obj } // LookupSecret will look for any k8s Secret with a given name in a given namespace. +// // Deprecated: won't be supported in future releases. func LookupSecret(ctx context.Context, c client.Client, ns string, name string) *corev1.Secret { secret := corev1.Secret{ diff --git a/pkg/util/kubernetes/service.go b/pkg/util/kubernetes/service.go index 18f2b45763..8093ce8e1e 100644 --- a/pkg/util/kubernetes/service.go +++ b/pkg/util/kubernetes/service.go @@ -19,6 +19,7 @@ package kubernetes import ( "fmt" + "strings" corev1 "k8s.io/api/core/v1" ) @@ -26,14 +27,16 @@ import ( // GetClusterTypeServiceURI will return the URL of the Service in the cluster type format. func GetClusterTypeServiceURI(svc *corev1.Service) string { url := fmt.Sprintf("http://%s.%s.svc.cluster.local", svc.Name, svc.Namespace) + var urlSb30 strings.Builder loop: for _, port := range svc.Spec.Ports { if port.Port != 80 { // Assuming HTTP default port - url += fmt.Sprintf(":%d", port.Port) + urlSb30.WriteString(fmt.Sprintf(":%d", port.Port)) break loop } } + url += urlSb30.String() return url } diff --git a/pkg/util/kubernetes/util.go b/pkg/util/kubernetes/util.go index 9c7bdc55cb..7979eb6847 100644 --- a/pkg/util/kubernetes/util.go +++ b/pkg/util/kubernetes/util.go @@ -50,7 +50,7 @@ func ToYAMLNoManagedFields(value runtime.Object) ([]byte, error) { return nil, err } - if m, ok := mapdata["metadata"].(map[string]interface{}); ok { + if m, ok := mapdata["metadata"].(map[string]any); ok { delete(m, "managedFields") } diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go index 32027cff10..8d13ba0638 100644 --- a/pkg/util/log/log.go +++ b/pkg/util/log/log.go @@ -51,32 +51,32 @@ type Logger struct { } // Debugf --. -func (l Logger) Debugf(format string, args ...interface{}) { +func (l Logger) Debugf(format string, args ...any) { l.delegate.V(1).Info(fmt.Sprintf(format, args...)) } // Infof --. -func (l Logger) Infof(format string, args ...interface{}) { +func (l Logger) Infof(format string, args ...any) { l.delegate.Info(fmt.Sprintf(format, args...)) } // Errorf --. -func (l Logger) Errorf(err error, format string, args ...interface{}) { +func (l Logger) Errorf(err error, format string, args ...any) { l.delegate.Error(err, fmt.Sprintf(format, args...)) } // Debug --. -func (l Logger) Debug(msg string, keysAndValues ...interface{}) { +func (l Logger) Debug(msg string, keysAndValues ...any) { l.delegate.V(1).Info(msg, keysAndValues...) } // Info --. -func (l Logger) Info(msg string, keysAndValues ...interface{}) { +func (l Logger) Info(msg string, keysAndValues ...any) { l.delegate.Info(msg, keysAndValues...) } // Error --. -func (l Logger) Error(err error, msg string, keysAndValues ...interface{}) { +func (l Logger) Error(err error, msg string, keysAndValues ...any) { l.delegate.Error(err, msg, keysAndValues...) } @@ -88,7 +88,7 @@ func (l Logger) WithName(name string) Logger { } // WithValues --. -func (l Logger) WithValues(keysAndValues ...interface{}) Logger { +func (l Logger) WithValues(keysAndValues ...any) Logger { return Logger{ delegate: l.delegate.WithValues(keysAndValues...), } @@ -191,7 +191,7 @@ func WithName(name string) Logger { } // WithValues --. -func WithValues(keysAndValues ...interface{}) Logger { +func WithValues(keysAndValues ...any) Logger { return Log.WithValues(keysAndValues...) } @@ -212,31 +212,31 @@ func ForIntegrationKit(target *v1.IntegrationKit) Logger { // *********************************** // Debugf --. -func Debugf(format string, args ...interface{}) { +func Debugf(format string, args ...any) { Log.Debugf(format, args...) } // Infof --. -func Infof(format string, args ...interface{}) { +func Infof(format string, args ...any) { Log.Infof(format, args...) } // Errorf --. -func Errorf(err error, format string, args ...interface{}) { +func Errorf(err error, format string, args ...any) { Log.Errorf(err, format, args...) } // Debug --. -func Debug(msg string, keysAndValues ...interface{}) { +func Debug(msg string, keysAndValues ...any) { Log.Debug(msg, keysAndValues...) } // Info --. -func Info(msg string, keysAndValues ...interface{}) { +func Info(msg string, keysAndValues ...any) { Log.Info(msg, keysAndValues...) } // Error --. -func Error(err error, msg string, keysAndValues ...interface{}) { +func Error(err error, msg string, keysAndValues ...any) { Log.Error(err, msg, keysAndValues...) } diff --git a/pkg/util/maven/maven_command.go b/pkg/util/maven/maven_command.go index 28b8876a50..5d0d4dddcb 100644 --- a/pkg/util/maven/maven_command.go +++ b/pkg/util/maven/maven_command.go @@ -183,7 +183,7 @@ func NewContext(buildDir string) Context { return Context{ Path: buildDir, AdditionalArguments: make([]string, 0), - AdditionalEntries: make(map[string]interface{}), + AdditionalEntries: make(map[string]any), } } @@ -195,13 +195,13 @@ type Context struct { UserSettings []byte SettingsSecurity []byte AdditionalArguments []string - AdditionalEntries map[string]interface{} + AdditionalEntries map[string]any LocalRepository string } -func (c *Context) AddEntry(id string, entry interface{}) { +func (c *Context) AddEntry(id string, entry any) { if c.AdditionalEntries == nil { - c.AdditionalEntries = make(map[string]interface{}) + c.AdditionalEntries = make(map[string]any) } c.AdditionalEntries[id] = entry @@ -211,7 +211,7 @@ func (c *Context) AddArgument(argument string) { c.AdditionalArguments = append(c.AdditionalArguments, argument) } -func (c *Context) AddArgumentf(format string, args ...interface{}) { +func (c *Context) AddArgumentf(format string, args ...any) { c.AdditionalArguments = append(c.AdditionalArguments, fmt.Sprintf(format, args...)) } @@ -328,18 +328,22 @@ func generateMavenContext(path string, args, options []string) error { func getMavenContext(args, options []string) string { mavenContext := "" + var mavenContextSb331 strings.Builder for _, arg := range args { arg = strings.TrimSpace(arg) if arg != "package" && len(arg) != 0 { - mavenContext += arg + "\n" + mavenContextSb331.WriteString(arg + "\n") } } + mavenContext += mavenContextSb331.String() + var mavenContextSb337 strings.Builder for _, opt := range options { opt = strings.TrimSpace(opt) if len(opt) != 0 { - mavenContext += opt + "\n" + mavenContextSb337.WriteString(opt + "\n") } } + mavenContext += mavenContextSb337.String() return mavenContext } diff --git a/pkg/util/maven/maven_project.go b/pkg/util/maven/maven_project.go index a00a041359..bc4fca628b 100644 --- a/pkg/util/maven/maven_project.go +++ b/pkg/util/maven/maven_project.go @@ -188,10 +188,10 @@ func NewRepository(repo string) v1.Repository { }, } - if idx := strings.Index(repo, "@"); idx != -1 { - r.URL = repo[:idx] + if before, after, ok := strings.Cut(repo, "@"); ok { + r.URL = before - for _, attribute := range strings.Split(repo[idx+1:], "@") { + for attribute := range strings.SplitSeq(after, "@") { switch { case attribute == "snapshots": r.Snapshots.Enabled = true @@ -213,10 +213,10 @@ func NewRepository(repo string) v1.Repository { func NewMirror(repo string) Mirror { m := Mirror{} - if idx := strings.Index(repo, "@"); idx != -1 { - m.URL = repo[:idx] + if before, after, ok := strings.Cut(repo, "@"); ok { + m.URL = before - for _, attribute := range strings.Split(repo[idx+1:], "@") { + for attribute := range strings.SplitSeq(after, "@") { switch { case strings.HasPrefix(attribute, "mirrorOf="): m.MirrorOf = attribute[9:] diff --git a/pkg/util/patch/patch.go b/pkg/util/patch/patch.go index 9ac1dc0914..611e3e4bbd 100644 --- a/pkg/util/patch/patch.go +++ b/pkg/util/patch/patch.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/json" ) -func MergePatch(source interface{}, target interface{}) ([]byte, error) { +func MergePatch(source any, target any) ([]byte, error) { sourceJSON, err := json.Marshal(source) if err != nil { return nil, err @@ -48,7 +48,7 @@ func MergePatch(source interface{}, target interface{}) ([]byte, error) { default: // Otherwise, for typed objects, remove null fields from the JSON merge patch, // so that values managed by controllers server-side are not deleted. - var positivePatch map[string]interface{} + var positivePatch map[string]any err = json.Unmarshal(mergePatch, &positivePatch) if err != nil { return nil, err @@ -76,7 +76,7 @@ func ApplyPatch(source runtime.Object) (*unstructured.Unstructured, error) { if err != nil { return nil, err } - var positivePatch map[string]interface{} + var positivePatch map[string]any err = json.Unmarshal(sourceJSON, &positivePatch) if err != nil { return nil, err diff --git a/pkg/util/reference/reference.go b/pkg/util/reference/reference.go index ea6c09adb3..0d051308c1 100644 --- a/pkg/util/reference/reference.go +++ b/pkg/util/reference/reference.go @@ -98,8 +98,8 @@ func (c *Converter) PropertiesFromString(str string) (map[string]string, error) } } } - parts := strings.Split(query, "&") - for _, part := range parts { + parts := strings.SplitSeq(query, "&") + for part := range parts { kv := strings.SplitN(part, "=", 2) if len(kv) != 2 { return nil, fmt.Errorf("invalid key=value format for string %q", part) diff --git a/pkg/util/s2i/build.go b/pkg/util/s2i/build.go index cbae411a4d..0318c54df6 100644 --- a/pkg/util/s2i/build.go +++ b/pkg/util/s2i/build.go @@ -35,7 +35,7 @@ import ( ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) -// Cancel the s2i Build by updating its status. +// CancelBuild cancels the s2i Build by updating its status. func CancelBuild(ctx context.Context, c client.Client, build *buildv1.Build) error { target := build.DeepCopy() target.Status.Cancelled = true @@ -47,7 +47,7 @@ func CancelBuild(ctx context.Context, c client.Client, build *buildv1.Build) err return nil } -// Wait for the s2i Build to complete with success or cancellation. +// WaitForS2iBuildCompletion waits for the s2i Build to complete with success or cancellation. func WaitForS2iBuildCompletion(ctx context.Context, c client.Client, build *buildv1.Build) error { key := ctrl.ObjectKeyFromObject(build) for { @@ -75,7 +75,7 @@ func WaitForS2iBuildCompletion(ctx context.Context, c client.Client, build *buil } } -// Create the BuildConfig of the build with the right owner after having deleted it already existed. +// BuildConfig creates the BuildConfig of the build with the right owner after having deleted it already existed. func BuildConfig(ctx context.Context, c client.Client, bc *buildv1.BuildConfig, owner metav1.Object) error { if err := c.Delete(ctx, bc); err != nil && !apierrors.IsNotFound(err) { return fmt.Errorf("cannot delete build config: %w", err) @@ -92,7 +92,7 @@ func BuildConfig(ctx context.Context, c client.Client, bc *buildv1.BuildConfig, return nil } -// Create the ImageStream for the builded image with the right owner after having deleted it already existed. +// ImageStream creates the ImageStream for the builded image with the right owner after having deleted it already existed. func ImageStream(ctx context.Context, c client.Client, is *imagev1.ImageStream, owner metav1.Object) error { if err := c.Delete(ctx, is); err != nil && !apierrors.IsNotFound(err) { return fmt.Errorf("cannot delete image stream: %w", err) diff --git a/pkg/util/source/inspector_java_source.go b/pkg/util/source/inspector_java_source.go index 00837ed116..cb3907a0b0 100644 --- a/pkg/util/source/inspector_java_source.go +++ b/pkg/util/source/inspector_java_source.go @@ -30,7 +30,7 @@ var ( replaceURIDoubleQuotedFromF = regexp.MustCompile(`fromF\s*\(\s*"(?:timer|cron|quartz)[^"]*"\s*\)`) ) -// JavaScriptInspector inspects Java DSL spec. +// JavaSourceInspector inspects Java DSL spec. type JavaSourceInspector struct { baseInspector } diff --git a/pkg/util/source/inspector_yaml.go b/pkg/util/source/inspector_yaml.go index bcbb4ca17d..e7e75099c9 100644 --- a/pkg/util/source/inspector_yaml.go +++ b/pkg/util/source/inspector_yaml.go @@ -34,7 +34,7 @@ type YAMLInspector struct { // Extract extracts all metadata from source spec. func (i YAMLInspector) Extract(source v1.SourceSpec, meta *Metadata) error { - definitions := make([]map[string]interface{}, 0) + definitions := make([]map[string]any, 0) if err := yaml2.Unmarshal([]byte(source.Content), &definitions); err != nil { return err @@ -66,13 +66,13 @@ func (i YAMLInspector) Extract(source v1.SourceSpec, meta *Metadata) error { } //nolint:nestif -func (i YAMLInspector) parseDefinition(def map[string]interface{}, meta *Metadata) error { +func (i YAMLInspector) parseDefinition(def map[string]any, meta *Metadata) error { for k, v := range def { if k == rest { meta.ExposesHTTPServices = true meta.RequiredCapabilities.Add(v1.CapabilityRest) // support contract first openapi - if oa, ok := v.(map[interface{}]interface{}); ok { + if oa, ok := v.(map[any]any); ok { if _, oaOk := oa["openApi"]; oaOk { if dfDep := i.catalog.GetArtifactByScheme("rest-openapi"); dfDep != nil { meta.AddDependency(dfDep.GetDependencyID()) @@ -86,7 +86,7 @@ func (i YAMLInspector) parseDefinition(def map[string]interface{}, meta *Metadat } //nolint:nestif -func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata) error { +func (i YAMLInspector) parseStep(key string, content any, meta *Metadata) error { switch key { case "bean": if bean := i.catalog.GetArtifactByScheme("bean"); bean != nil { @@ -98,10 +98,10 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata case "circuitBreaker": meta.RequiredCapabilities.Add(v1.CapabilityCircuitBreaker) case "marshal", "unmarshal": - if cm, ok := content.(map[interface{}]interface{}); ok { + if cm, ok := content.(map[any]any); ok { if js, jsOk := cm["json"]; jsOk { dataFormatID := defaultJSONDataFormat - if jsContent, jsContentOk := js.(map[interface{}]interface{}); jsContentOk { + if jsContent, jsContentOk := js.(map[any]any); jsContentOk { if lib, libOk := jsContent["library"]; libOk { dataFormatID = strings.ToLower(fmt.Sprintf("%s", lib)) } @@ -115,7 +115,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata switch t := content.(type) { case string: AddKamelet(meta, kamelet+":"+t) - case map[interface{}]interface{}: + case map[any]any: if name, ok := t["name"].(string); ok { AddKamelet(meta, kamelet+":"+name) } @@ -127,7 +127,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata switch t := content.(type) { case string: maybeURI = t - case map[interface{}]interface{}: + case map[any]any: for k, v := range t { if s, ok := k.(string); ok { if dependency, ok := i.catalog.GetLanguageDependency(s); ok { @@ -137,7 +137,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata switch k { case "steps": - if steps, stepsFormatOk := v.([]interface{}); stepsFormatOk { + if steps, stepsFormatOk := v.([]any); stepsFormatOk { if err := i.parseStepsParam(steps, meta); err != nil { return err } @@ -147,7 +147,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata builtURI := vv // Inject parameters into URIs to allow other parts of the operator to inspect them if params, pok := t["parameters"]; pok { - if paramMap, pmok := params.(map[interface{}]interface{}); pmok { + if paramMap, pmok := params.(map[any]any); pmok { params := make(map[string]string, len(paramMap)) for k, v := range paramMap { ks := fmt.Sprintf("%v", k) @@ -164,7 +164,7 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata if dependency, ok := i.catalog.GetLanguageDependency(s); ok { meta.AddDependency(dependency) } - } else if m, ok := v.(map[interface{}]interface{}); ok { + } else if m, ok := v.(map[any]any); ok { if err := i.parseStep("language", m, meta); err != nil { return err } @@ -182,11 +182,11 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata default: // Always follow children because from/to uris can be nested if ks, ok := k.(string); ok { - if _, ok := v.(map[interface{}]interface{}); ok { + if _, ok := v.(map[any]any); ok { if err := i.parseStep(ks, v, meta); err != nil { return err } - } else if ls, ok := v.([]interface{}); ok { + } else if ls, ok := v.([]any); ok { for _, el := range ls { if err := i.parseStep(ks, el, meta); err != nil { return err @@ -211,9 +211,9 @@ func (i YAMLInspector) parseStep(key string, content interface{}, meta *Metadata } // TODO nolint: gocyclo. -func (i YAMLInspector) parseStepsParam(steps []interface{}, meta *Metadata) error { +func (i YAMLInspector) parseStepsParam(steps []any, meta *Metadata) error { for _, raw := range steps { - if step, stepFormatOk := raw.(map[interface{}]interface{}); stepFormatOk { + if step, stepFormatOk := raw.(map[any]any); stepFormatOk { if len(step) != 1 { return fmt.Errorf("unable to parse step: %v", step) } @@ -241,7 +241,7 @@ func (i YAMLInspector) parseStepsParam(steps []interface{}, meta *Metadata) erro // ReplaceFromURI parses the source content and replace the `from` URI configuration with the a new URI. // Returns true if it applies a replacement. func (i YAMLInspector) ReplaceFromURI(source *v1.SourceSpec, newFromURI string) (bool, error) { - definitions := make([]map[string]interface{}, 0) + definitions := make([]map[string]any, 0) if err := yaml2.Unmarshal([]byte(source.Content), &definitions); err != nil { return false, err @@ -249,17 +249,17 @@ func (i YAMLInspector) ReplaceFromURI(source *v1.SourceSpec, newFromURI string) // We expect the from in .route.from or .from location for _, routeRaw := range definitions { - var from map[interface{}]interface{} + var from map[any]any var fromOk bool - route, routeOk := routeRaw["route"].(map[interface{}]interface{}) + route, routeOk := routeRaw["route"].(map[any]any) if routeOk { - from, fromOk = route["from"].(map[interface{}]interface{}) + from, fromOk = route["from"].(map[any]any) if !fromOk { return false, nil } } if from == nil { - from, fromOk = routeRaw["from"].(map[interface{}]interface{}) + from, fromOk = routeRaw["from"].(map[any]any) if !fromOk { return false, nil } diff --git a/pkg/util/uri/uri.go b/pkg/util/uri/uri.go index 96e9c255e7..95370c6cf9 100644 --- a/pkg/util/uri/uri.go +++ b/pkg/util/uri/uri.go @@ -78,10 +78,12 @@ func AppendParameters(uri string, params map[string]string) string { keys = append(keys, k) } sort.Strings(keys) + var uriSb81 strings.Builder for _, k := range keys { - uri += fmt.Sprintf("%s%s=%s", prefix, url.QueryEscape(k), url.QueryEscape(params[k])) + uriSb81.WriteString(fmt.Sprintf("%s%s=%s", prefix, url.QueryEscape(k), url.QueryEscape(params[k]))) prefix = "&" } + uri += uriSb81.String() return uri } diff --git a/pkg/util/util.go b/pkg/util/util.go index a4669f5d94..fd3de0564d 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -24,12 +24,14 @@ import ( "errors" "fmt" "io" + "maps" "math" "math/rand" "os" "path" "path/filepath" "regexp" + "slices" "sort" "strconv" "strings" @@ -76,13 +78,7 @@ func StringSliceContains(slice []string, items []string) bool { } func StringSliceExists(slice []string, item string) bool { - for i := range slice { - if slice[i] == item { - return true - } - } - - return false + return slices.Contains(slice, item) } func StringSliceContainsAnyOf(slice []string, items ...string) bool { @@ -103,10 +99,8 @@ func StringSliceUniqueAdd(slice *[]string, item string) bool { newSlice := make([]string, 0) slice = &newSlice } - for _, i := range *slice { - if i == item { - return false - } + if slices.Contains(*slice, item) { + return false } *slice = append(*slice, item) @@ -163,11 +157,11 @@ func RandomString(n int) string { return sb.String() } -func EncodeXML(content interface{}) ([]byte, error) { +func EncodeXML(content any) ([]byte, error) { return encodeXML(content, xml.Header) } -func encodeXML(content interface{}, xmlHeader string) ([]byte, error) { +func encodeXML(content any, xmlHeader string) ([]byte, error) { w := &bytes.Buffer{} w.WriteString(xmlHeader) @@ -304,7 +298,7 @@ type BytesMarshaller interface { MarshalBytes() ([]byte, error) } -func SortedMapKeys(m map[string]interface{}) []string { +func SortedMapKeys(m map[string]any) []string { res := make([]string, len(m)) i := 0 for k := range m { @@ -334,9 +328,7 @@ func CopyMap(source map[string]string) map[string]string { return nil } dest := make(map[string]string, len(source)) - for k, v := range source { - dest[k] = v - } + maps.Copy(dest, source) return dest } @@ -350,8 +342,8 @@ func JSONToYAML(src []byte) ([]byte, error) { return MapToYAML(mapdata) } -func JSONToMap(src []byte) (map[string]interface{}, error) { - jsondata := map[string]interface{}{} +func JSONToMap(src []byte) (map[string]any, error) { + jsondata := map[string]any{} err := json.Unmarshal(src, &jsondata) if err != nil { return nil, fmt.Errorf("error unmarshalling json: %w", err) @@ -360,7 +352,7 @@ func JSONToMap(src []byte) (map[string]interface{}, error) { return jsondata, nil } -func MapToYAML(src map[string]interface{}) ([]byte, error) { +func MapToYAML(src map[string]any) ([]byte, error) { yamldata, err := yaml2.Marshal(&src) if err != nil { return nil, fmt.Errorf("error marshalling to yaml: %w", err) @@ -516,7 +508,7 @@ func trimQuotes(s string) string { // NavigateConfigTree switch to the element in the tree represented by the "nodes" spec and creates intermediary // nodes if missing. Nodes specs starting with "[" and ending in "]" are treated as slice indexes. -func NavigateConfigTree(current interface{}, nodes []string) (interface{}, error) { +func NavigateConfigTree(current any, nodes []string) (any, error) { if len(nodes) == 0 { return current, nil } @@ -527,18 +519,18 @@ func NavigateConfigTree(current interface{}, nodes []string) (interface{}, error return strings.HasPrefix(nodes[idx], "[") && strings.HasSuffix(nodes[idx], "]") } - makeNext := func() interface{} { + makeNext := func() any { if isSlice(1) { - slice := make([]interface{}, 0) + slice := make([]any, 0) return &slice } - return make(map[string]interface{}) + return make(map[string]any) } switch c := current.(type) { - case map[string]interface{}: - var next interface{} + case map[string]any: + var next any if n, ok := c[nodes[0]]; ok { next = n } else { @@ -547,7 +539,7 @@ func NavigateConfigTree(current interface{}, nodes []string) (interface{}, error } return NavigateConfigTree(next, nodes[1:]) - case *[]interface{}: + case *[]any: if !isSlice(0) { return nil, fmt.Errorf("attempting to set map value %q into a slice", nodes[0]) } @@ -555,7 +547,7 @@ func NavigateConfigTree(current interface{}, nodes []string) (interface{}, error if err != nil { return nil, fmt.Errorf("value %q inside brackets is not numeric: %w", nodes[0], err) } - var next interface{} + var next any if len(*c) > pos && (*c)[pos] != nil { next = (*c)[pos] } else { diff --git a/pkg/util/watch/watch.go b/pkg/util/watch/watch.go index 0c10a70234..20fc469686 100644 --- a/pkg/util/watch/watch.go +++ b/pkg/util/watch/watch.go @@ -127,18 +127,12 @@ func isAllowed(lastEvent, event *corev1.Event, baseTime int64) bool { return true } - curTime := event.CreationTimestamp.UnixNano() - if event.LastTimestamp.UnixNano() > curTime { - curTime = event.LastTimestamp.UnixNano() - } + curTime := max(event.LastTimestamp.UnixNano(), event.CreationTimestamp.UnixNano()) if curTime < baseTime { return false } - lastTime := lastEvent.CreationTimestamp.UnixNano() - if lastEvent.LastTimestamp.UnixNano() > lastTime { - lastTime = lastEvent.LastTimestamp.UnixNano() - } + lastTime := max(lastEvent.LastTimestamp.UnixNano(), lastEvent.CreationTimestamp.UnixNano()) if curTime < lastTime { return false } diff --git a/script/Makefile b/script/Makefile index 5ed8f706ea..686e90fd12 100644 --- a/script/Makefile +++ b/script/Makefile @@ -29,18 +29,18 @@ LAST_RELEASED_IMAGE_NAME := camel-k-operator LAST_RELEASED_VERSION ?= 2.9.0 DEFAULT_RUNTIME_VERSION := 3.15.3 # Kubernetes tooling -CONTROLLER_GEN_VERSION := v0.19.0 +CONTROLLER_GEN_VERSION := v0.20.0 CONTROLLER_GEN=$(GOBIN)/controller-gen -CODEGEN_VERSION := v0.34.1 -OPERATOR_SDK_VERSION := v1.30.0 -KUSTOMIZE_VERSION := v4.5.4 -OPM_VERSION := v1.24.0 +CODEGEN_VERSION := v0.35.0 +OPERATOR_SDK_VERSION := v1.42.0 +KUSTOMIZE_VERSION := v5.7.1 +OPM_VERSION := v1.61.0 # Golang tooling LINTER ?= $(LOCALBIN)/golangci-lint DEADCODE ?= $(LOCALBIN)/deadcode GOVULNCHECK ?= $(LOCALBIN)/govulncheck GOIMPORT ?= $(LOCALBIN)/goimports -LINTER_VERSION ?= v2.4.0 +LINTER_VERSION ?= v2.8.0 GOVULNCHECK_VERSION ?= latest LINT_GOGC ?= 20 LINT_DEADLINE ?= 10m @@ -586,7 +586,7 @@ ifeq (, $(shell command -v kubectl 2> /dev/null)) endif kustomize: - go install sigs.k8s.io/kustomize/kustomize/v4@$(KUSTOMIZE_VERSION) + go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION) KUSTOMIZE=$(GOBIN)/kustomize operator-sdk: detect-os diff --git a/script/gen_crd/gen-crd-api-config.json b/script/gen_crd/gen-crd-api-config.json index 49b75f58cf..6532c66890 100644 --- a/script/gen_crd/gen-crd-api-config.json +++ b/script/gen_crd/gen-crd-api-config.json @@ -10,7 +10,7 @@ "externalPackages": [ { "typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/", - "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" + "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" } ], "typeDisplayNamePrefixOverrides": { diff --git a/script/gen_crd/gen-kamelets-crd-api-config.json b/script/gen_crd/gen-kamelets-crd-api-config.json index c6c2a7b8a3..b729534b9b 100644 --- a/script/gen_crd/gen-kamelets-crd-api-config.json +++ b/script/gen_crd/gen-kamelets-crd-api-config.json @@ -10,7 +10,7 @@ "externalPackages": [ { "typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/", - "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.34/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" + "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.35/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" }, { "typeMatchPrefix": "^github\\.com/apache/camel-k/v2/pkg/apis/camel/v1\\.",