You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/10/06 09:58:56 UTC
[camel-k] branch release-1.8.x updated (20f051869 -> e4d45897e)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 20f051869 Adds the default maven repositories if extra ones are added
new 57cd21601 fix(#3671): Fix native mode for KameletBinding
new e4d45897e chore(build): Update Kind cluster version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/builder.yml | 4 ++--
.github/workflows/knative.yml | 8 ++++----
.github/workflows/kubernetes.yml | 4 ++--
.github/workflows/upgrade.yml | 4 ++--
pkg/trait/quarkus.go | 11 +++++++++++
pkg/trait/quarkus_test.go | 21 +++++++++++++++++++++
6 files changed, 42 insertions(+), 10 deletions(-)
[camel-k] 02/02: chore(build): Update Kind cluster version
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e4d45897e2fc64fd45b35099f85bf744a6b9812e
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Oct 4 21:20:08 2022 +0200
chore(build): Update Kind cluster version
Fixes "failed to set GOMAXPROCS from cgroups" errors on Camel K operator
---
.github/workflows/builder.yml | 4 ++--
.github/workflows/knative.yml | 8 ++++----
.github/workflows/kubernetes.yml | 4 ++--
.github/workflows/upgrade.yml | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index b520ff8a7..9d2efc1b5 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -83,8 +83,8 @@ jobs:
- name: Kubernetes KinD Cluster
uses: container-tools/kind-action@v1
with:
- version: v0.11.0
- node_image: kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad
+ version: v0.14.0
+ node_image: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
- name: Info
run: |
kubectl cluster-info
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index e333dbc1c..3e2831728 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -82,8 +82,8 @@ jobs:
- name: Kubernetes KinD Cluster
uses: container-tools/kind-action@v1
with:
- version: v0.11.0
- node_image: kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad
+ version: v0.14.0
+ node_image: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
- name: Info
run: |
kubectl version
@@ -200,8 +200,8 @@ jobs:
- name: Kubernetes KinD Cluster
uses: container-tools/kind-action@v1
with:
- version: v0.11.0
- node_image: kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad
+ version: v0.14.0
+ node_image: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
- name: Info
run: |
kubectl version
diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml
index 654d70a98..a693877f8 100644
--- a/.github/workflows/kubernetes.yml
+++ b/.github/workflows/kubernetes.yml
@@ -84,8 +84,8 @@ jobs:
- name: Kubernetes KinD Cluster
uses: container-tools/kind-action@v1
with:
- version: v0.11.0
- node_image: kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad
+ version: v0.14.0
+ node_image: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
- name: Info
run: |
kubectl cluster-info
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
index f85cdfb19..d40813c87 100644
--- a/.github/workflows/upgrade.yml
+++ b/.github/workflows/upgrade.yml
@@ -85,8 +85,8 @@ jobs:
- name: Kubernetes KinD Cluster
uses: container-tools/kind-action@v1
with:
- version: v0.11.0
- node_image: kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad
+ version: v0.14.0
+ node_image: kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
- name: Info
run: |
kubectl cluster-info
[camel-k] 01/02: fix(#3671): Fix native mode for KameletBinding
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 57cd21601198e62029fb203f5f17d95d94f9543e
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Sep 27 19:38:42 2022 +0200
fix(#3671): Fix native mode for KameletBinding
Propagate annotation trait configuration from Integration to IntegrationKit. This makes sure that the kit matches the integration once the native build is done.
---
pkg/trait/quarkus.go | 11 +++++++++++
pkg/trait/quarkus_test.go | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index f93de9cb0..828bd914b 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -21,6 +21,7 @@ import (
"encoding/json"
"fmt"
"sort"
+ "strings"
"github.com/rs/xid"
@@ -270,6 +271,16 @@ func (t *quarkusTrait) newIntegrationKit(e *Environment, packageType quarkusPack
if v, ok := integration.Annotations[v1.PlatformSelectorAnnotation]; ok {
kit.Annotations[v1.PlatformSelectorAnnotation] = v
}
+
+ if kit.GetAnnotations() == nil {
+ kit.SetAnnotations(make(map[string]string))
+ }
+ for k, v := range integration.Annotations {
+ if strings.HasPrefix(k, v1.TraitAnnotationPrefix) {
+ kit.GetAnnotations()[k] = v
+ }
+ }
+
operatorID := defaults.OperatorID()
if operatorID != "" {
kit.Annotations[v1.OperatorIDAnnotation] = operatorID
diff --git a/pkg/trait/quarkus_test.go b/pkg/trait/quarkus_test.go
index 1b54f3d93..fb4ae4cf2 100644
--- a/pkg/trait/quarkus_test.go
+++ b/pkg/trait/quarkus_test.go
@@ -69,6 +69,27 @@ func TestApplyQuarkusTraitDefaultKitLayout(t *testing.T) {
assert.Equal(t, environment.IntegrationKits[0].Labels[v1.IntegrationKitLayoutLabel], v1.IntegrationKitLayoutFastJar)
}
+func TestApplyQuarkusTraitAnnotationKitConfiguration(t *testing.T) {
+ quarkusTrait, environment := createNominalQuarkusTest()
+ environment.Integration.Status.Phase = v1.IntegrationPhaseBuildingKit
+
+ if environment.Integration.GetAnnotations() == nil {
+ environment.Integration.SetAnnotations(make(map[string]string))
+ }
+ environment.Integration.GetAnnotations()[v1.TraitAnnotationPrefix+"quarkus.foo"] = "camel-k"
+
+ configured, err := quarkusTrait.Configure(environment)
+ assert.True(t, configured)
+ assert.Nil(t, err)
+
+ err = quarkusTrait.Apply(environment)
+ assert.Nil(t, err)
+ assert.Len(t, environment.IntegrationKits, 1)
+ assert.Equal(t, v1.IntegrationKitLayoutFastJar, environment.IntegrationKits[0].Labels[v1.IntegrationKitLayoutLabel])
+ assert.Equal(t, "camel-k", environment.IntegrationKits[0].Annotations[v1.TraitAnnotationPrefix+"quarkus.foo"])
+
+}
+
func createNominalQuarkusTest() (*quarkusTrait, *Environment) {
trait, _ := newQuarkusTrait().(*quarkusTrait)
trait.Enabled = BoolP(true)