This is an automated email from the ASF dual-hosted git repository. squakez pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 00384a8d71fe801b4a3f32a1e1f652b858fcee34 Author: Pasquale Congiusti <[email protected]> AuthorDate: Sat Nov 14 16:13:22 2026 +0100 chore: cleanup after backporting from main on 261114 Last included commit 0bb1804e404e7972a9bdd2b7b68e519e6ce4057e --- pkg/cmd/bind.go | 1 - pkg/controller/integrationkit/integrationkit_controller.go | 2 +- pkg/controller/pipe/integration.go | 2 +- pkg/resources/resources_test.go | 6 +++--- pkg/trait/builder.go | 1 - pkg/util/digest/digest.go | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go index 93badda1e..4f2be292f 100644 --- a/pkg/cmd/bind.go +++ b/pkg/cmd/bind.go @@ -172,7 +172,6 @@ func (o *bindCmdOptions) validate(cmd *cobra.Command, args []string) error { return trait.ValidateTraits(catalog, extractTraitNames(o.Traits)) } -//nolint:gocognit func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error { client, err := o.GetCmdClient() if err != nil { diff --git a/pkg/controller/integrationkit/integrationkit_controller.go b/pkg/controller/integrationkit/integrationkit_controller.go index 45144c2d3..dc986b70f 100644 --- a/pkg/controller/integrationkit/integrationkit_controller.go +++ b/pkg/controller/integrationkit/integrationkit_controller.go @@ -150,7 +150,7 @@ type reconcileIntegrationKit struct { // The Controller will requeue the Request to be processed again if the returned error is non-nil or // Result.Requeue is true, otherwise upon completion it will remove the work from the queue. // -//nolint:gocognit + func (r *reconcileIntegrationKit) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { rlog := Log.WithValues("request-namespace", request.Namespace, "request-name", request.Name) rlog.Debug("Reconciling IntegrationKit") diff --git a/pkg/controller/pipe/integration.go b/pkg/controller/pipe/integration.go index c1e26f0a3..6396ff3e4 100644 --- a/pkg/controller/pipe/integration.go +++ b/pkg/controller/pipe/integration.go @@ -42,7 +42,7 @@ var ( // CreateIntegrationFor creates and Integration from a Pipe. // -//nolint:cyclop,gocognit,gocyclo +//nolint:gocognit func CreateIntegrationFor(ctx context.Context, c client.Client, pipe *v1.Pipe) (*v1.Integration, error) { controller := true blockOwnerDeletion := true diff --git a/pkg/resources/resources_test.go b/pkg/resources/resources_test.go index 71f4e5e3f..913d94e91 100644 --- a/pkg/resources/resources_test.go +++ b/pkg/resources/resources_test.go @@ -171,8 +171,8 @@ func TestStorageClassesRBACIsClusterScoped(t *testing.T) { assert.Equal(t, "camel-k-operator", binding.Subjects[0].Name) // the common RBAC kustomization must ship them, so they apply to every installation mode - kustomization, err := ResourceAsString("config/rbac/kustomization.yaml") + kustomization, err := Resource("config/rbac/kustomization.yaml") require.NoError(t, err) - assert.Contains(t, kustomization, "get-storageclasses-cluster-role.yaml") - assert.Contains(t, kustomization, "get-storageclasses-cluster-role-binding.yaml") + assert.Contains(t, string(kustomization), "get-storageclasses-cluster-role.yaml") + assert.Contains(t, string(kustomization), "get-storageclasses-cluster-role-binding.yaml") } diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go index b1a1f57a7..7cc73aade 100644 --- a/pkg/trait/builder.go +++ b/pkg/trait/builder.go @@ -249,7 +249,6 @@ func failIntegrationKit(e *Environment, conditionType v1.IntegrationKitCondition return nil } -//nolint:gocognit func (t *builderTrait) builderTask(e *Environment, taskConf *v1.BuildConfiguration) (*v1.BuilderTask, error) { maven := e.Platform.Maven diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go index b87df8788..d438c7b33 100644 --- a/pkg/util/digest/digest.go +++ b/pkg/util/digest/digest.go @@ -46,7 +46,7 @@ const ( // ComputeForIntegration a digest of the fields that are relevant for the deployment // Produces a digest that can be used as docker image tag. // -//nolint:cyclop,gocognit,gocyclo +//nolint:gocognit func ComputeForIntegration(integration *v1.Integration, configmapVersions []string, secretVersions []string) (string, error) { hash := sha256.New() // Integration version is relevant
