You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/10/03 13:10:23 UTC
[camel-k] branch release-1.10.x updated (bbcc87ba1 -> e7a63e7d3)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from bbcc87ba1 chore(e2e): added observed generation check
new ca312c8df Align to Camel-k-runtime 1.15.0 and camel-kamelets 0.9.1 tag
new e7a63e7d3 fix(ci): build resources before testing
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:
pkg/util/defaults/defaults.go | 2 +-
resources/traits.yaml | 5 ++---
script/Makefile | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
[camel-k] 01/02: Align to Camel-k-runtime 1.15.0 and camel-kamelets 0.9.1 tag
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ca312c8dfee97139054f24eb4cb5a26a33a82cdc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 3 11:47:48 2022 +0200
Align to Camel-k-runtime 1.15.0 and camel-kamelets 0.9.1 tag
---
pkg/util/defaults/defaults.go | 2 +-
resources/traits.yaml | 5 ++---
script/Makefile | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 2cc246a15..bdc103167 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.10.1-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.14.0"
+ DefaultRuntimeVersion = "1.15.0"
// BuildahVersion --
BuildahVersion = "1.23.3"
diff --git a/resources/traits.yaml b/resources/traits.yaml
index b72bb0a3e..9c5c1007c 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -97,8 +97,8 @@ traits:
description: The AWS Region to use
- name: use-default-credentials-provider,omitempty
type: bool
- description: Define if we want to use the Default Credentials Provider chain as
- authentication method
+ description: 'The adapter-specific policy to use when filling the cache (use:
+ minimizing / maximizing). Check the component documentation if unsure'
- name: azure-key-vault
platform: false
profiles:
@@ -132,7 +132,6 @@ traits:
- name: vault-name,omitempty
type: string
description: The Azure Vault Name for accessing Key Vault
->>>>>>> 19075447 (Added Support for Azure Key Vault addon)
- name: builder
platform: true
profiles:
diff --git a/script/Makefile b/script/Makefile
index df9bdea7d..d660a87c4 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.10.1-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 1.10.0
-RUNTIME_VERSION := 1.14.0
+RUNTIME_VERSION := 1.15.0
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 0.17.1
INSTALL_DEFAULT_KAMELETS := true
@@ -75,12 +75,12 @@ OPM := opm
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO :=
+STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1472
# Define here the repo containing the default Kamelet catalog (if any)
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Optional branch for the default Kamelet catalog (change this to a tag before release)
-KAMELET_CATALOG_REPO_BRANCH := v0.9.0
+KAMELET_CATALOG_REPO_BRANCH := v0.9.1
# When performing integration tests, it is not necessary to always execute build, especially
# in e2e tests when lots of tests are being executed sequentially & the build has already taken place.
[camel-k] 02/02: fix(ci): build resources before testing
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e7a63e7d330715a3bdac57424560c3299f78fbd3
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Oct 3 13:27:10 2022 +0200
fix(ci): build resources before testing
---
script/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/script/Makefile b/script/Makefile
index d660a87c4..e42b6bde1 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -207,7 +207,7 @@ codegen-tools-install:
@echo "sigs.k8s.io/controller-tools/cmd/controller-gen with version $(CONTROLLER_GEN_VERSION)"
go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION)
-build: test build-resources build-kamel build-compile-integration-tests build-submodules
+build: build-resources test build-kamel build-compile-integration-tests build-submodules
ci-build: clean codegen set-module-version set-version check-licenses dir-licenses build-kamel cross-compile