This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to tag v2.6.0
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ebb7fe5c5be10e3d031b4f31ca11daff22518234
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Sat Feb 8 11:19:17 2025 +0100
chore(release): preparing for tag v2.6.0
---
pkg/resources/config/manager/operator-deployment.yaml | 6 +++---
.../config/manifests/bases/camel-k.clusterserviceversion.yaml | 4 ++--
pkg/resources/config/manifests/kustomization.yaml | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
script/git_tag.sh | 8 ++++----
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkg/resources/config/manager/operator-deployment.yaml
b/pkg/resources/config/manager/operator-deployment.yaml
index 2cf491821..a85c81207 100644
--- a/pkg/resources/config/manager/operator-deployment.yaml
+++ b/pkg/resources/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: "2.6.0-SNAPSHOT"
+ app.kubernetes.io/version: "2.6.0"
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: "2.6.0-SNAPSHOT"
+ app.kubernetes.io/version: "2.6.0"
spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:2.6.0-SNAPSHOT
+ image: docker.io/apache/camel-k:2.6.0
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git
a/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
index baa33738e..b611fb1dd 100644
--- a/pkg/resources/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/pkg/resources/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:2.6.0-SNAPSHOT
- createdAt: 2025-02-07T12:15:30Z
+ containerImage: docker.io/apache/camel-k:2.6.0
+ createdAt: 2025-02-08T10:19:05Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
diff --git a/pkg/resources/config/manifests/kustomization.yaml
b/pkg/resources/config/manifests/kustomization.yaml
index 7afacef34..d18f6d005 100644
--- a/pkg/resources/config/manifests/kustomization.yaml
+++ b/pkg/resources/config/manifests/kustomization.yaml
@@ -36,4 +36,4 @@ patchesStrategicMerge:
images:
- name: docker.io/apache/camel-k
newName: docker.io/apache/camel-k
- newTag: 2.6.0-SNAPSHOT
+ newTag: 2.6.0
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index d39d7ec14..17597f721 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -23,7 +23,7 @@ package defaults
const (
// Version --
- Version = "2.6.0-SNAPSHOT"
+ Version = "2.6.0"
// DefaultRuntimeVersion --
DefaultRuntimeVersion = "3.15.2"
diff --git a/script/Makefile b/script/Makefile
index 0e1d9d564..ae1e66e64 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -24,7 +24,7 @@ PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
LOCALBIN := $(PROJECT_PATH)/bin
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION ?= 2.6.0-SNAPSHOT
+VERSION ?= 2.6.0
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 2.5.1
DEFAULT_RUNTIME_VERSION := 3.15.2
diff --git a/script/git_tag.sh b/script/git_tag.sh
index af1cff7c6..86f2b9c0e 100755
--- a/script/git_tag.sh
+++ b/script/git_tag.sh
@@ -28,13 +28,13 @@ target_tag=v$target_version
target_staging=staging-$target_tag
target_remote=$2
-git add helm docs || true
-git commit -m "chore(release): Helm chart for $target_version"
-git push -f
+# git add helm docs || true
+# git commit -m "chore(release): Helm chart for $target_version"
+# git push
git branch -D ${target_staging} || true
git checkout -b ${target_staging}
-git add pkg/resources script || true
+git add pkg/resources pkg/util script || true
git commit -m "chore(release): preparing for tag v$target_version" || true
git tag --force ${target_tag} ${target_staging}
