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/09/07 12:46:22 UTC
[camel-k] branch release-1.10.x updated (45f7582c6 -> 24695d725)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 45f7582c6 Added Helm Chart for 1.10.0
new 0d2e4f2b2 feat: `make bump`
new 24695d725 chore: 1.10.1 config setting
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:
config/manager/operator-deployment.yaml | 6 +++---
config/manifests/bases/camel-k.clusterserviceversion.yaml | 10 +++++-----
helm/camel-k/Chart.yaml | 2 +-
helm/camel-k/values.yaml | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 9 ++++++++-
6 files changed, 19 insertions(+), 12 deletions(-)
[camel-k] 01/02: feat: `make bump`
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.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0d2e4f2b22ed51135d05c6e1634441be7a6e5693
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Sep 5 15:05:28 2022 +0200
feat: `make bump`
`make bump VERSION=<new-version> 'LAST_RELEASED_VERSION=<replace-version>` is in charge to upgrade all needed configuration
---
script/Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/script/Makefile b/script/Makefile
index 32ec90aed..df9bdea7d 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,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
+LAST_RELEASED_VERSION ?= 1.10.0
RUNTIME_VERSION := 1.14.0
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 0.17.1
@@ -134,6 +134,13 @@ endef
export LICENSE_HEADER
default: build
+bump-replace:
+ @# Bump version and replace with the variables provided by the user
+ @sed -i 's/^VERSION ?= .*$//VERSION ?= $(VERSION)/' ./script/Makefile
+ @sed -i 's/^LAST_RELEASED_VERSION ?= .*$//LAST_RELEASED_VERSION ?= $(LAST_RELEASED_VERSION)/' ./script/Makefile
+
+bump: bump-replace codegen bundle
+
# Generates the version file
codegen:
$(info Regenerating $(VERSIONFILE))
[camel-k] 02/02: chore: 1.10.1 config setting
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.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 24695d725fc8ff268caa1b3c17b4a8584d63c27f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Sep 7 10:58:58 2022 +0200
chore: 1.10.1 config setting
---
config/manager/operator-deployment.yaml | 6 +++---
config/manifests/bases/camel-k.clusterserviceversion.yaml | 10 +++++-----
helm/camel-k/Chart.yaml | 2 +-
helm/camel-k/values.yaml | 2 +-
pkg/util/defaults/defaults.go | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml
index 676a32923..a93464881 100644
--- a/config/manager/operator-deployment.yaml
+++ b/config/manager/operator-deployment.yaml
@@ -25,7 +25,7 @@ metadata:
name: camel-k-operator
app.kubernetes.io/component: operator
app.kubernetes.io/name: camel-k
- app.kubernetes.io/version: "1.10.0"
+ app.kubernetes.io/version: "1.10.1-SNAPSHOT"
spec:
replicas: 1
strategy:
@@ -41,12 +41,12 @@ spec:
app: "camel-k"
app.kubernetes.io/component: operator
app.kubernetes.io/name: camel-k
- app.kubernetes.io/version: "1.10.0"
+ app.kubernetes.io/version: "1.10.1-SNAPSHOT"
spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.10.0
+ image: docker.io/apache/camel-k:1.10.1-SNAPSHOT
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 8158b87ee..e20bfaf3f 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -22,8 +22,8 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.10.0
- createdAt: 2022-05-31T12:18:30Z
+ containerImage: docker.io/apache/camel-k:1.10.1-SNAPSHOT
+ createdAt: 2022-09-07T08:57:35Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.3.0
@@ -31,7 +31,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k.v1.10.0
+ name: camel-k.v1.10.1
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -153,8 +153,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
+ replaces: camel-k-operator.v1.10.0
selector:
matchLabels:
name: camel-k-operator
- version: 1.10.0
- replaces: camel-k-operator.v1.9.2
+ version: 1.10.1
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 2155443b4..863f7f3d0 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -35,7 +35,7 @@ version: 0.11.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
-appVersion: 1.10.0
+appVersion: 1.10.1-SNAPSHOT
icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png
home: https://camel.apache.org/camel-k/latest/
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index a5b0ef8c3..8c5077fb7 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,7 +23,7 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:1.10.0
+ image: docker.io/apache/camel-k:1.10.1-SNAPSHOT
global: "false"
resources: {}
securityContext: {}
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index b697291ed..2cc246a15 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -23,7 +23,7 @@ package defaults
const (
// Version --
- Version = "1.10.0"
+ Version = "1.10.1-SNAPSHOT"
// DefaultRuntimeVersion --
DefaultRuntimeVersion = "1.14.0"