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/06 08:02:03 UTC

[camel-k] 03/03: feat: `make bump`

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit ad784ddfd33b58be927ca33968ebfa51006b9cde
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
---
 config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +-
 config/manifests/kustomization.yaml                       | 5 +----
 script/Makefile                                           | 9 ++++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 5f52e3828..e33d68c07 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
     categories: Integration & Delivery
     certified: "false"
     containerImage: docker.io/apache/camel-k:1.11.0-SNAPSHOT
-    createdAt: 2022-09-05T10:34:46Z
+    createdAt: 2022-09-05T12:56:17Z
     description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
       with serverless superpowers.
     operators.operatorframework.io/builder: operator-sdk-v1.3.0
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
index 0478812de..d95d4d36c 100644
--- a/config/manifests/kustomization.yaml
+++ b/config/manifests/kustomization.yaml
@@ -31,7 +31,4 @@ resources:
 
 patchesStrategicMerge:
 - patch-delete-user-cluster-role.yaml
-images:
-- name: docker.io/apache/camel-k
-  newName: docker.io/apache/camel-k
-  newTag: 1.11.0-SNAPSHOT
+
diff --git a/script/Makefile b/script/Makefile
index 77d3ba5a0..4f1c51290 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,7 @@
 VERSIONFILE := pkg/util/defaults/defaults.go
 VERSION ?= 1.11.0-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))