chore(release): preparing for tag v2.6.0

apache · Feb 8, 2025 · ebb7fe5 · ebb7fe5
1 parent 5d95dbc
commit ebb7fe5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}