Merge branch 'apache:main' into knative_service_url

.github/actions/automatic-updates/action.yml

@@ -50,12 +50,6 @@ runs:
         distribution: ${{ inputs.javaDistribution }}
         java-version: ${{ inputs.javaVersion }}
 
-    - name: Generate changelog
-      uses: ./.github/actions/changelog
-      with:
-        token: ${{ inputs.secretGithubToken }}
-        release_branch: ${{ inputs.branch-ref }}
-
     # Autogenerated resources
     - name: Run project refresh actions
       shell: bash
@@ -97,7 +91,7 @@ runs:
       run: |
         git config --local user.email "$CI_EMAIL"
         git config --local user.name "$CI_USER"
-        git add README.adoc CHANGELOG.md && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit"
+        git commit -am 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit"
         git push "https://$CI_USER:$CI_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:${{ inputs.branch-ref }} || echo "No nightly automatic updates changes to push"
 
     # Give it a rest to avoid hitting Github API rate limit

.gitmodules

@@ -1,6 +1,3 @@
-[submodule ".github/actions/changelog"]
-	path = .github/actions/changelog
-	url = https://github.com/CharMixer/auto-changelog-action
 [submodule ".github/actions/gh-go-mod-generate-sbom"]
 	path = .github/actions/gh-go-mod-generate-sbom
 	url = https://github.com/CycloneDX/gh-gomod-generate-sbom/

README.adoc

@@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/actions/workflows/common.yml/badge.svg["
 image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative", link="https://github.com/apache/camel-k/actions/workflows/knative.yml"]
 image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml"]
 image:https://github.com/apache/camel-k/actions/workflows/native.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/native.yml"]
-image:https://img.shields.io/badge/Coverage-43.4-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml"]
+image:https://img.shields.io/badge/Coverage-43.8-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml"]
 image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com"]
 
 Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider.

addons/addons_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/apache/camel-k/v2/addons/master"
-	"github.com/apache/camel-k/v2/addons/telemetry"
 	v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
 	"github.com/apache/camel-k/v2/pkg/trait"
 
@@ -61,8 +60,4 @@ func TestTraitConfiguration(t *testing.T) {
 	assert.Equal(t, "test-label", *master.LabelKey)
 	assert.Equal(t, "test-value", *master.LabelValue)
 
-	require.NotNil(t, c.GetTrait("telemetry"))
-	telemetry, ok := c.GetTrait("telemetry").(*telemetry.TestTelemetryTrait)
-	require.True(t, ok)
-	assert.True(t, *telemetry.Enabled)
 }

addons/keda/keda_test.go

@@ -129,21 +129,23 @@ func TestKameletAutoDetection(t *testing.T) {
 				},
 			},
 			Spec: camelv1.KameletSpec{
-				Definition: &camelv1.JSONSchemaProps{
-					Properties: map[string]camelv1.JSONSchemaProp{
-						"a": {
-							XDescriptors: []string{
-								"urn:keda:metadata:a",
+				KameletSpecBase: camelv1.KameletSpecBase{
+					Definition: &camelv1.JSONSchemaProps{
+						Properties: map[string]camelv1.JSONSchemaProp{
+							"a": {
+								XDescriptors: []string{
+									"urn:keda:metadata:a",
+								},
 							},
-						},
-						"b": {
-							XDescriptors: []string{
-								"urn:keda:metadata:bb",
+							"b": {
+								XDescriptors: []string{
+									"urn:keda:metadata:bb",
+								},
 							},
-						},
-						"c": {
-							XDescriptors: []string{
-								"urn:keda:authentication:cc",
+							"c": {
+								XDescriptors: []string{
+									"urn:keda:authentication:cc",
+								},
 							},
 						},
 					},
@@ -245,21 +247,23 @@ func TestPipeAutoDetection(t *testing.T) {
 				},
 			},
 			Spec: camelv1.KameletSpec{
-				Definition: &camelv1.JSONSchemaProps{
-					Properties: map[string]camelv1.JSONSchemaProp{
-						"a": {
-							XDescriptors: []string{
-								"urn:keda:metadata:a",
+				KameletSpecBase: camelv1.KameletSpecBase{
+					Definition: &camelv1.JSONSchemaProps{
+						Properties: map[string]camelv1.JSONSchemaProp{
+							"a": {
+								XDescriptors: []string{
+									"urn:keda:metadata:a",
+								},
 							},
-						},
-						"b": {
-							XDescriptors: []string{
-								"urn:keda:metadata:bb",
+							"b": {
+								XDescriptors: []string{
+									"urn:keda:metadata:bb",
+								},
 							},
-						},
-						"c": {
-							XDescriptors: []string{
-								"urn:keda:authentication:cc",
+							"c": {
+								XDescriptors: []string{
+									"urn:keda:authentication:cc",
+								},
 							},
 						},
 					},