You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by "hxxxi-malog (via GitHub)" <gi...@apache.org> on 2026/09/13 14:00:14 UTC

[PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

hxxxi-malog opened a new pull request, #6807:
URL: https://github.com/apache/camel-k/pull/6807

   Fixes #6805
   
   Removes the `logging`, `master` and `telemetry` traits, deprecated since 2.9.0, following the same removal pattern used for the Jolokia trait (#6764).
   
   ## What is removed
   
   * Trait implementations, registrations and unit tests (`pkg/trait/logging.go`, `master.go`, `telemetry.go`)
   * Jaeger discovery support (`pkg/trait/discovery/`), only used by the telemetry trait
   * Master RBAC embedded templates (`resources/addons/master/*.tmpl`) — this also removes an automatic RBAC creation path from the operator, in line with the security guidance to keep RBAC under explicit deployer control
   * Trait documentation pages, nav entries and autogenerated CRD/API/doc artifacts (regenerated)
   
   ## What is kept (compatibility)
   
   * `spec.traits` fields remain as deprecated Go fields (`DeprecatedLogging`, `DeprecatedMaster`, `DeprecatedTelemetry`) with their original JSON names (`logging`, `master`, `telemetry`), so existing Integrations and Pipes keep serializing unchanged
   * Configurations targeting the removed traits in `spec.traits` are ignored with a WARN log
   * Legacy trait annotations (`trait.camel.apache.org/{logging,master,telemetry}.*`) are ignored and cleaned up during migration, while any other unknown trait annotation still fails validation (typo protection)
   * The exported `resources.TemplateResource` API is preserved: it was only consumed by the master trait, but it is a general-purpose public API
   
   ## Migration
   
   * **logging** → Quarkus logging properties: `traits.logging.level=DEBUG` → `-p quarkus.log.level=DEBUG`
   * **telemetry** → Quarkus OpenTelemetry properties: `--trait telemetry.endpoint=http://jaeger:4317` → `-p quarkus.otel.exporter.otlp.traces.endpoint=http://jaeger:4317`
   * **master** → create the required Role/RoleBinding manually, then configure:
     `-p quarkus.camel.cluster.kubernetes.resource-name=<integration>-lock`
     `-p quarkus.camel.cluster.kubernetes.resource-type=Lease`
     `-p quarkus.camel.cluster.kubernetes.labels."camel.apache.org/integration"=<integration-name>`
     (for existing Integrations, create the manual RBAC **before** removing the trait configuration)
   
   ## Tests
   
   * Table-driven unit tests for all three removed traits (catalog ignores config, trait absent from catalog)
   * Legacy JSON field names round-trip and `Traits.Merge` compatibility
   * Legacy annotation paths covered for Integration, IntegrationKit and Pipe conversion
   * `TestTemplateResource` restored with a neutral test fixture
   * E2E usages migrated to Quarkus properties (`pipe_test.go`, `cron_test.go`); master/telemetry e2e suites had already been migrated to manual RBAC/properties when the traits were deprecated
   
   ## Verification
   
   * Affected package unit tests pass (`pkg/trait`, `pkg/resources`, `pkg/controller/pipe`, `pkg/apis/camel/v1`)
   * `go vet`, `gofmt` and golangci-lint clean
   * Generated artifacts verified drift-free against the pinned toolchain (controller-gen v0.20.0); deepcopy regenerated to match CI output style; client/CRD/Helm/docs regeneration produces no further changes
   
   ---
   
   _Generated with assistance from Codex, then reviewed and completed by @hxxxi-malog._


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710260075

   > E2E master test has to be removed as well. Not sure if there is also logging left over.
   
   Thanks, I'll remove the e2e master test. As for logging leftovers, I couldn't find any — there is no logging-specific e2e test, and the remaining loggerName usages are Kamelet configuration unrelated to the trait. The DeprecatedLogging field in `pkg/apis/camel/v1/trait/logging.go` is kept intentionally, as required by the deprecated API compatibility discussed earlier. 
   
   One question: `e2e/telemetry/telemetry_test.go` (TestTelemetryTrait) is in the same situation — it no longer uses the trait and instead configures `quarkus.otel.*` properties directly. Shall I remove it as well?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5714701108

   OK, I've finished adding the dependency to every KamelRun in the master e2e test, and now we can start testing to see how it works.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5714943128

   :warning: Unit test coverage report - coverage decreased from 63.8% to 63.6% (**-0.2%**)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5726172346

   @hxxxi-malog okey, let's go with it. However, we will need a follow up issue in order to manage the automatic dependency detection directly when parsing the DSL, like done with regular components.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on code in PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#discussion_r4026653353


##########
e2e/common/misc/pipe_test.go:
##########
@@ -76,7 +76,7 @@ func TestPipe(t *testing.T) {
 					"-p", "sink.loggerName=integrationLogger",
 					"-p", "error-handler.loggerName=kameletErrorHandler",
 					// Needed in the test to make sure to do the right string comparison later
-					"-t", "logging.color=false",
+					"-p", "quarkus.console.color=false",

Review Comment:
   ```suggestion
   					"-t", "camel.properties=quarkus.console.color=false",
   ```



##########
e2e/common/misc/pipe_test.go:
##########
@@ -55,7 +55,7 @@ func TestPipe(t *testing.T) {
 					"-p", "sink.loggerName=integrationLogger",
 					"-p", "error-handler.loggerName=kameletErrorHandler",
 					// Needed in the test to make sure to do the right string comparison later
-					"-t", "logging.color=false",
+					"-p", "quarkus.console.color=false",

Review Comment:
   ```suggestion
   					"-t", "camel.properties=quarkus.console.color=false",
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5667375136

   Thank you for your review. I have now reverted the special handling in ExtractAndMaybeDeleteTraits and configureTrait, removed the removed-trait-specific tests, and changed TestTraitsMerge to use the cron trait.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5738984635

   Done on both fronts: adds `-d camel:timer` to the test runs and drops the legacy `resource-type=Lease` property. I've also opened the follow-up issue.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5699112652

   > > @hxxxi-malog please, rebase. Once done if all checks are green we can merge.请重新处理一下。一旦所有检查都通过,我们就可以进行合并了。
   > 
   > Thanks for your review. The validate check on main is also red at `run.go`, and it looks like it was introduced by the new gofmt addition. How should this be handled?
   
   Ah, yeah, sorry, that is some wrong formatting that I'm going to fix it in `main` right away. Won't be a blocker for merging this PR.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on code in PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#discussion_r4006382267


##########
pkg/apis/camel/v1/common_types_support_test.go:
##########
@@ -35,7 +36,7 @@ func TestTraitsMerge(t *testing.T) {
 			Auto:        ptr.To(false),
 			ServicePort: 81,
 		},
-		Logging: &trait.LoggingTrait{
+		DeprecatedLogging: &trait.LoggingTrait{

Review Comment:
   We better use another trait to test the merge. If we can do in this PR that's great, otherwise it can be a follow up PR.



##########
pkg/apis/camel/v1/common_types_support_test.go:
##########
@@ -61,9 +62,23 @@ func TestTraitsMerge(t *testing.T) {
 	assert.Equal(t, int32(81), t1.Container.ServicePort)
 
 	// values from merged trait take precedence over the original ones
-	assert.NotNil(t, t1.Logging)
-	assert.True(t, ptr.Deref(t1.Logging.Color, false))
-	assert.Equal(t, "DEBUG", t1.Logging.Level)
+	assert.NotNil(t, t1.DeprecatedLogging)
+	assert.True(t, ptr.Deref(t1.DeprecatedLogging.Color, false))
+	assert.Equal(t, "DEBUG", t1.DeprecatedLogging.Level)
+}
+
+func TestDeprecatedTraitsJSONNames(t *testing.T) {

Review Comment:
   Let's remove this, it really adds nothing.



##########
pkg/trait/trait_configure.go:
##########
@@ -88,6 +88,8 @@ func (c *Catalog) configureTrait(id string, trait map[string]any) error {
 		if err := decodeTrait(trait, catTrait); err != nil {
 			return err
 		}
+	} else if len(trait) > 0 {

Review Comment:
   Why this change here? I think we can silently ignore the configuration without bloating the log.



##########
pkg/trait/util.go:
##########
@@ -356,6 +365,15 @@ func ExtractAndMaybeDeleteTraits(c client.Client, annotations map[string]string,
 	return &traits, nil
 }
 
+func isRemovedTrait(id string) bool {

Review Comment:
   This is not needed. We have many removed traits and we cannot control them.



##########
pkg/trait/util_test.go:
##########
@@ -256,6 +256,56 @@ func TestIntegrationAndPipeSameTraits(t *testing.T) {
 	assert.True(t, result)
 }
 
+func TestExtractAndMaybeDeleteRemovedTraitAnnotations(t *testing.T) {
+	for _, traitID := range []string{"logging", "master", "telemetry"} {
+		t.Run(traitID, func(t *testing.T) {
+			client, err := internal.NewFakeClient()
+			require.NoError(t, err)
+
+			annotation := v1.TraitAnnotationPrefix + traitID + ".enabled"
+			annotations := map[string]string{annotation: "true"}
+
+			traits, err := ExtractAndMaybeDeleteTraits(client, annotations, true)
+			require.NoError(t, err)
+			assert.Nil(t, traits)
+			assert.NotContains(t, annotations, annotation)
+		})
+	}
+}
+
+func TestNewSpecTraitsOptionsIgnoreRemovedTraitAnnotations(t *testing.T) {

Review Comment:
   Remove



##########
pkg/trait/trait_configure_test.go:
##########
@@ -162,3 +160,44 @@ func TestTraitSplitConfiguration(t *testing.T) {
 	ot, _ := c.GetTrait("owner").(*ownerTrait)
 	assert.Equal(t, []string{"opt1", "opt2"}, ot.TargetLabels)
 }
+
+func TestRemovedTraitConfiguration(t *testing.T) {

Review Comment:
   I'd avoid this test. The fact that that trait logic is missing should be enough to confirm these traits cannot be executed.



##########
pkg/trait/util.go:
##########
@@ -330,19 +330,28 @@ func ExtractAndMaybeDeleteTraits(c client.Client, annotations map[string]string,
 	traitsPlainParams := []string{}
 	for k, v := range annotations {
 		//nolint:staticcheck
-		if strings.HasPrefix(k, v1.TraitAnnotationPrefix) {

Review Comment:
   Why this change? I think we need to revert and keep the same logic as before. We don't want any special treatment to removed traits logic.



##########
pkg/controller/pipe/integration_test.go:
##########
@@ -294,6 +294,23 @@ func TestExtractTraitAnnotations(t *testing.T) {
 	assert.Equal(t, "hello", annotations["my-personal-annotation"])
 }
 
+func TestExtractRemovedTraitAnnotations(t *testing.T) {

Review Comment:
   No need for this test IMO



##########
pkg/trait/util_test.go:
##########
@@ -256,6 +256,56 @@ func TestIntegrationAndPipeSameTraits(t *testing.T) {
 	assert.True(t, result)
 }
 
+func TestExtractAndMaybeDeleteRemovedTraitAnnotations(t *testing.T) {

Review Comment:
   Remove.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on code in PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#discussion_r4005696840


##########
pkg/resources/resources_test.go:
##########
@@ -123,32 +119,14 @@ func TestResourcesWithPrefix(t *testing.T) {
 }
 
 func TestTemplateResource(t *testing.T) {
-	fname := "master-role-lease.tmpl"
-	name := "myintegration-master"
-	ns := "test-nm"
-
-	templateData := struct {
-		Namespace      string
-		Name           string
-		ServiceAccount string
+	data, err := TemplateResource("/resources/testdata/template.tmpl", struct {

Review Comment:
   if `TemplateResource()` was only used in master trait, then it can be removed (as well as this test).



##########
pkg/resources/resources/testdata/template.tmpl:
##########
@@ -0,0 +1 @@
+name: {{ .Name }}

Review Comment:
   It seems this is required by some test. I suspect we can remove the test and the business logic which was likely only used in master test.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5665296186

   Now, `TemplateResource()`, its test and the `template.tmpl` fixture are all gone.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on code in PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#discussion_r4006988890


##########
pkg/trait/util.go:
##########
@@ -330,19 +330,28 @@ func ExtractAndMaybeDeleteTraits(c client.Client, annotations map[string]string,
 	traitsPlainParams := []string{}
 	for k, v := range annotations {
 		//nolint:staticcheck
-		if strings.HasPrefix(k, v1.TraitAnnotationPrefix) {

Review Comment:
   Sorry, I over-engineered this. The convention here is simply to keep the deprecated API fields and let removed traits behave like any other unknown trait. I've reverted the special handling along with the related tests and the WARN log.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez merged PR #6807:
URL: https://github.com/apache/camel-k/pull/6807


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710749112

   @hxxxi-malog sorry, I made a mistake. Just double checking and the master test was fine, I mean, it did not reference already any master trait. It must stay, and, if it failed, we need to verify why. Please revert the related removal and we can run another round of test to validate what was really going on. My apologies for the confusion.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710823842

   OK, the master e2e test and its fixture have been reverted, with content identical to main.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5711008415

   :warning: Unit test coverage report - coverage decreased from 63.8% to 63.6% (**-0.2%**)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5700278687

   @squakez The rebase is complete: the current head (`0fb3e88`) includes the latest main (`e946417`), with no commits behind. Both suggestions in `e2e/common/misc/pipe_test.go` now use `-t camel.properties=quarkus.console.color=false`, and all review threads are resolved.
   
   Could you please approve the pending workflow runs and take another look? All 11 workflows for the current head are marked `action_required`, so green CI is still pending.
   
   _AI-generated by Codex on behalf of @hxxxi-malog._


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5741245143

   :warning: Unit test coverage report - coverage decreased from 63.9% to 63.8% (**-0.1%**)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5698327737

   Pipe test is failing with
   ```
   [6](https://github.com/apache/camel-k/actions/runs/34865831079/job/104267087651?pr=6807#step:7:366)
   ❌ TestPipe (12.41s)
         pipe_test.go:59: 
             Expected success, but got an error:
                 <*errors.errorString | 0x176aec23b7b0>: 
                 property key "quarkus.console.color" does not start with "source.", "sink.", "error-handler." or "step-<n>."
                 {
                     s: "property key \"quarkus.console.color\" does not start with \"source.\", \"sink.\", \"error-handler.\" or \"step-<n>.\"",
                 }
   ```
   I think that the `-p` in `kamel bind` has different logic that in `kamel run`.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5698413465

   @hxxxi-malog please, rebase. Once done if all checks are green we can merge.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5698665107

   > @hxxxi-malog please, rebase. Once done if all checks are green we can merge.请重新处理一下。一旦所有检查都通过,我们就可以进行合并了。
   
   Thanks for your review. The validate check on main is also red at pkg/cmd/run.go:129, and it looks like it was introduced by the new gofmt addition. How should this be handled?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5699329364

   @hxxxi-malog should be fixed on `main` now. Feel free to rebase


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5700315073

   Thanks @squakez ! The rebase is done, the branch is now on top of the latest main, and both camel.properties suggestions have been included.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5698793122

   :warning: Unit test coverage report - coverage decreased from 63.8% to 63.6% (**-0.2%**)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5714336144

   I think the reason the check failed is that the deleted master trait is still automatically activated on main and adds the master capability to the Integration. During the build, this is used to package the cluster service library into the image. After removing it, the image is missing that library, so Quarkus ignores those three properties, and the `master:` endpoint reports "No cluster service found". The solution is to explicitly add the dependency in the migration path: `-d mvn:org.apache.camel.quarkus:camel-quarkus-kubernetes-cluster-service`. Is it okay to make the change in this direction?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710574092

   Done, the master e2e test has been removed in the commit, and its dedicated route fixture `Master.java` has also been deleted, as it is no longer referenced anywhere else.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5716018069

   Hmm... it looks like the last dependency fix has taken effect, but the test still fails because the trait has revealed another hidden responsibility: the deleted trait would parse URIs like `master:lock:timer:tick` and add the inner `camel:timer` component to the dependencies. I'll add `-d camel:timer` in the test; also, the `resource-type=Lease` property is no longer valid in the new runtime. Does this approach sound feasible?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5664939748

   :warning: Unit test coverage report - coverage decreased from 63.2% to 63.1% (**-0.1%**)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on code in PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#discussion_r4005872536


##########
pkg/resources/resources_test.go:
##########
@@ -123,32 +119,14 @@ func TestResourcesWithPrefix(t *testing.T) {
 }
 
 func TestTemplateResource(t *testing.T) {
-	fname := "master-role-lease.tmpl"
-	name := "myintegration-master"
-	ns := "test-nm"
-
-	templateData := struct {
-		Namespace      string
-		Name           string
-		ServiceAccount string
+	data, err := TemplateResource("/resources/testdata/template.tmpl", struct {

Review Comment:
   Thank you for your review feedback. Deleting the exported Go API is technically a breaking change, which is also why it was kept initially; however, I will now remove it.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on code in PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#discussion_r4005910742


##########
pkg/resources/resources_test.go:
##########
@@ -123,32 +119,14 @@ func TestResourcesWithPrefix(t *testing.T) {
 }
 
 func TestTemplateResource(t *testing.T) {
-	fname := "master-role-lease.tmpl"
-	name := "myintegration-master"
-	ns := "test-nm"
-
-	templateData := struct {
-		Namespace      string
-		Name           string
-		ServiceAccount string
+	data, err := TemplateResource("/resources/testdata/template.tmpl", struct {

Review Comment:
   Yes, strictly speaking it is true. However, the API is not really meant to be used publicly, so we are more flexible and can reduce the code that is not used internally.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "hxxxi-malog (via GitHub)" <gi...@apache.org>.
hxxxi-malog commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5796325526

   Thanks for the merge. I'll try to tackle issue #6830 when I have time later. Of course, if anyone claims that issue, feel free to @ me and I can help complete it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710006906

   E2E master test has to be removed as well. Not sure if there is also logging left over.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710157016

   :warning: Unit test coverage report - coverage decreased from 63.8% to 63.6% (**-0.2%**)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5714362593

   > I think the reason the check failed is that the deleted master trait is still automatically activated on main and adds the master capability to the Integration. During the build, this is used to package the cluster service library into the image. After removing it, the image is missing that library, so Quarkus ignores those three properties, and the `master:` endpoint reports "No cluster service found". The solution is to explicitly add the dependency in the migration path: `-d mvn:org.apache.camel.quarkus:camel-quarkus-kubernetes-cluster-service`. Is it okay to make the change in this direction?
   
   Yeah, it seems it is the correct diagnose. Please, add the related dependency into the test and we can restart a round of test, thanks!


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] feat(traits): remove deprecated logging, master and telemetry traits [camel-k]

Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on PR #6807:
URL: https://github.com/apache/camel-k/pull/6807#issuecomment-5710327519

   Telemetry test needs to stay as they are testing telemetries via the new mechanism, not involving older trait. Thanks!


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org