Merge branch 'apache:main' into devesh

.github/actions/kamel-build/action.yml

@@ -55,13 +55,9 @@ runs:
         image-namespace: ${{ inputs.image-namespace }}
         make-rules: ${{ inputs.make-rules }}
 
-    #
-    # By default do not build the image bundle
-    #
     - id: build-kamel-bundle
       name: Build Kamel Metadata Bundle
       uses: ./.github/actions/kamel-build-bundle
-      if: ${{ inputs.build-bundle == 'true' }}
       with:
         image-registry-push-host: ${{ inputs.image-registry-push-host }}
         image-registry-pull-host: ${{ inputs.image-registry-pull-host }}

.github/workflows/security.yaml

@@ -51,7 +51,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
-      - name: lint
+      - name: vuln
         shell: bash
         run: |
           make vuln

.github/workflows/validate.yml

@@ -22,18 +22,24 @@ on:
     branches:
       - main
       - "release-*"
-    paths:
-      - 'pkg/**'
-      - 'cmd/**'
-      - 'addons/**'
+    paths-ignore:
+      - 'proposals/**'
+      - '**.adoc'
+      - '**.md'
+      - 'KEYS'
+      - 'LICENSE'
+      - 'NOTICE'
   push:
     branches:
       - main
       - "release-*"
-    paths:
-      - 'pkg/**'
-      - 'cmd/**'
-      - 'addons/**'
+    paths-ignore:
+      - 'proposals/**'
+      - '**.md'
+      - '**.adoc'
+      - 'KEYS'
+      - 'LICENSE'
+      - 'NOTICE'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -54,3 +60,7 @@ jobs:
         shell: bash
         run: |
           make lint
+      - name: licenses
+        shell: bash
+        run: |
+          make check-licenses

CHANGELOG.md

@@ -6,25 +6,44 @@
 
 **Closed issues:**
 
+- Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652)
+- Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635)
+- Installation tests are unstable [\#5632](https://github.com/apache/camel-k/issues/5632)
+- Add license header file check workflow on PR in CI [\#5631](https://github.com/apache/camel-k/issues/5631)
 - Service/KService not created for vertx-websocket consumers [\#5628](https://github.com/apache/camel-k/issues/5628)
 - Modeline container.port trait config set as String value [\#5621](https://github.com/apache/camel-k/issues/5621)
+- Trait annotations saved on the IntegrationKit resource [\#5620](https://github.com/apache/camel-k/issues/5620)
 - Documentation links to old Camel K examples location [\#5619](https://github.com/apache/camel-k/issues/5619)
 - maven-settings-offline-template.xml does not contain license [\#5603](https://github.com/apache/camel-k/issues/5603)
 - Bring back Quarkus native test in PR [\#5598](https://github.com/apache/camel-k/issues/5598)
+- Nightly release note still define ARM64 specific instructions [\#5596](https://github.com/apache/camel-k/issues/5596)
 - Unable to specify any CloudEvent attributes or extensions, except for `type` [\#5537](https://github.com/apache/camel-k/issues/5537)
 - Move deprecated v1alpha1.KameletBinding tests to v1.Pipe [\#5490](https://github.com/apache/camel-k/issues/5490)
 - Move tests, examples and documentation from groovy to yaml [\#5489](https://github.com/apache/camel-k/issues/5489)
 - Add a deploy make target [\#5460](https://github.com/apache/camel-k/issues/5460)
 - Remove health readiness workaround when fixed in Camel [\#5451](https://github.com/apache/camel-k/issues/5451)
+- Deprecate some of the camel.apache.org annotation in favor of k8s's recommended labels [\#5212](https://github.com/apache/camel-k/issues/5212)
 - Dependency Service Discovery for Camel K [\#5196](https://github.com/apache/camel-k/issues/5196)
 - Mount configmap/secret resources to a dedicated resources.d durectory [\#5181](https://github.com/apache/camel-k/issues/5181)
+-  Add missing functionalities and resolve possible discrepancies  [\#4951](https://github.com/apache/camel-k/issues/4951)
 - Support YAML DSL routes configuration [\#4893](https://github.com/apache/camel-k/issues/4893)
 - Kustomize installation does not work [\#4528](https://github.com/apache/camel-k/issues/4528)
 - Kustomize default [\#4135](https://github.com/apache/camel-k/issues/4135)
 - Deprecate `kamel install` and promote Kustomize-based installation to primary method [\#3865](https://github.com/apache/camel-k/issues/3865)
+- Add e2e monitoring tests for vanilla Kubernetes [\#1667](https://github.com/apache/camel-k/issues/1667)
 
 **Merged pull requests:**
 
+- chore\(deps\): bump github.com/container-tools/spectrum from 0.6.42 to 0.6.45 [\#5655](https://github.com/apache/camel-k/pull/5655) ([dependabot[bot]](https://github.com/apps/dependabot))
+- \(\#5652\) Added TimeoutSeconds to knative-serving trait [\#5653](https://github.com/apache/camel-k/pull/5653) ([hernanDatgDev](https://github.com/hernanDatgDev))
+- \(\#5635\) Add TLS configuration in the ingress trait [\#5650](https://github.com/apache/camel-k/pull/5650) ([romain-pfund](https://github.com/romain-pfund))
+- chore\(cmd\): remove deprecated .spec.integration usage [\#5649](https://github.com/apache/camel-k/pull/5649) ([squakez](https://github.com/squakez))
+- fix\(e2e\): always build bundle and set local config [\#5647](https://github.com/apache/camel-k/pull/5647) ([squakez](https://github.com/squakez))
+- chore\(deps\): bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0 in /java/crds [\#5644](https://github.com/apache/camel-k/pull/5644) ([dependabot[bot]](https://github.com/apps/dependabot))
+- chore\(deps\): bump k8s.io/klog/v2 from 2.120.1 to 2.130.0 [\#5643](https://github.com/apache/camel-k/pull/5643) ([dependabot[bot]](https://github.com/apps/dependabot))
+- chore\(deps\): bump github.com/spf13/cobra from 1.8.0 to 1.8.1 [\#5642](https://github.com/apache/camel-k/pull/5642) ([dependabot[bot]](https://github.com/apps/dependabot))
+- fix\(traits\): annotations refactoring  [\#5637](https://github.com/apache/camel-k/pull/5637) ([squakez](https://github.com/squakez))
+- feat\(ci\): check licenses on PRs [\#5636](https://github.com/apache/camel-k/pull/5636) ([gansheer](https://github.com/gansheer))
 - chore\(release\): fix missing licenses [\#5630](https://github.com/apache/camel-k/pull/5630) ([gansheer](https://github.com/gansheer))
 - feat\(ci\): local installation procedure [\#5629](https://github.com/apache/camel-k/pull/5629) ([squakez](https://github.com/squakez))
 - feat\(ci\): bring back Quarkus native execution on PR and pushes [\#5626](https://github.com/apache/camel-k/pull/5626) ([squakez](https://github.com/squakez))

addons/addons_test.go

@@ -20,8 +20,6 @@ package addons
 import (
 	"testing"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"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"
@@ -68,37 +66,3 @@ func TestTraitConfiguration(t *testing.T) {
 	require.True(t, ok)
 	assert.True(t, *telemetry.Enabled)
 }
-
-func TestTraitConfigurationFromAnnotations(t *testing.T) {
-	env := trait.Environment{
-		Integration: &v1.Integration{
-			ObjectMeta: metav1.ObjectMeta{
-				Annotations: map[string]string{
-					"trait.camel.apache.org/master.enabled":       "true",
-					"trait.camel.apache.org/master.resource-name": "test-lock",
-					"trait.camel.apache.org/master.label-key":     "test-label",
-					"trait.camel.apache.org/master.label-value":   "test-value",
-					"trait.camel.apache.org/telemetry.enabled":    "true",
-				},
-			},
-			Spec: v1.IntegrationSpec{
-				Profile: v1.TraitProfileKubernetes,
-			},
-		},
-	}
-	c := trait.NewCatalog(nil)
-	require.NoError(t, c.Configure(&env))
-
-	require.NotNil(t, c.GetTrait("master"))
-	master, ok := c.GetTrait("master").(*master.TestMasterTrait)
-	require.True(t, ok)
-	assert.True(t, *master.Enabled)
-	assert.Equal(t, "test-lock", *master.ResourceName)
-	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)
-}