You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2022/06/01 02:09:39 UTC
[camel-k] branch main updated (5b925e725 -> 79da2cc68)
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 5b925e725 Updated CHANGELOG.md
new 25b9790bc fix(ci): fix Upgrade E2E testing on CI
new b5ef7f363 fix(ci): let's support Camel K 10+ versions
new 79da2cc68 fix(ci): update last released version to 1.9.2
The 3 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:
.github/actions/kamel-build-bundle/build-bundle-image.sh | 4 ++--
.github/actions/kamel-build-bundle/build-index-image.sh | 4 ++--
config/manifests/bases/camel-k.clusterserviceversion.yaml | 10 +++++-----
script/Makefile | 4 +++-
4 files changed, 12 insertions(+), 10 deletions(-)
[camel-k] 03/03: fix(ci): update last released version to 1.9.2
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 79da2cc68fd55336df0d527cb2eece5ae0dd20ca
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue May 31 21:22:46 2022 +0900
fix(ci): update last released version to 1.9.2
This fixes the upgrade e2e failures.
---
config/manifests/bases/camel-k.clusterserviceversion.yaml | 10 +++++-----
script/Makefile | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 84665eef6..a526b4ae9 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.10.0-SNAPSHOT
- createdAt: 2022-05-13T13:57:18Z
+ createdAt: 2022-05-31T12:18:30Z
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.9.1
+ name: camel-k.v1.10.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -153,9 +153,9 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v1.9.0
+ replaces: camel-k-operator.v1.9.2
selector:
matchLabels:
name: camel-k-operator
- version: 1.9.1
- replaces: camel-k-operator.v1.9.0
+ version: 1.10.0
+ replaces: camel-k-operator.v1.9.2
diff --git a/script/Makefile b/script/Makefile
index 9f41ca96e..3fca06aa5 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.10.0-SNAPSHOT
OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
LAST_RELEASED_IMAGE_NAME := camel-k-operator
-LAST_RELEASED_VERSION := 1.9.1
+LAST_RELEASED_VERSION := 1.9.2
RUNTIME_VERSION := 1.13.0
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
[camel-k] 02/03: fix(ci): let's support Camel K 10+ versions
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b5ef7f363c04c8a023ec0816f3540c9ecb2231ff
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue May 31 15:41:53 2022 +0900
fix(ci): let's support Camel K 10+ versions
---
.github/actions/kamel-build-bundle/build-bundle-image.sh | 4 ++--
.github/actions/kamel-build-bundle/build-index-image.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/actions/kamel-build-bundle/build-bundle-image.sh b/.github/actions/kamel-build-bundle/build-bundle-image.sh
index 4ad2e7b6e..217c0cdf9 100755
--- a/.github/actions/kamel-build-bundle/build-bundle-image.sh
+++ b/.github/actions/kamel-build-bundle/build-bundle-image.sh
@@ -106,9 +106,9 @@ popd
export LOCAL_IMAGE_BUNDLE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION}
export CUSTOM_IMAGE=${IMAGE_NAME}
-export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d.\d+')"
+export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d+\.\d+')"
echo "PREV_XY_CHANNEL=${PREV_XY_CHANNEL}" >> $GITHUB_ENV
-export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d.\d+")
+export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d+\.\d+")
echo "NEW_XY_CHANNEL=${NEW_XY_CHANNEL}" >> $GITHUB_ENV
make bundle-build \
diff --git a/.github/actions/kamel-build-bundle/build-index-image.sh b/.github/actions/kamel-build-bundle/build-index-image.sh
index 146d08ba4..0078928fc 100755
--- a/.github/actions/kamel-build-bundle/build-index-image.sh
+++ b/.github/actions/kamel-build-bundle/build-index-image.sh
@@ -211,10 +211,10 @@ cat << EOF >> ${CATALOG_DIR}/camel-k.yaml
---
schema: olm.channel
package: camel-k
-name: stable-dev-$(make get-version | grep -Po "\d.\d+")
+name: stable-dev-$(make get-version | grep -Po "\d+\.\d+")
entries:
- name: $(make get-csv-name)
- replaces: $(make get-last-released-img-name).v$(make get-last-released-version | grep -Po "\d.\d+.\d+")
+ replaces: $(make get-last-released-img-name).v$(make get-last-released-version | grep -Po "\d+\.\d+\.\d+")
EOF
#
[camel-k] 01/03: fix(ci): fix Upgrade E2E testing on CI
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 25b9790bc2c6ae5da875544f26adb7c2f8c4c10a
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue May 31 13:35:18 2022 +0900
fix(ci): fix Upgrade E2E testing on CI
Fix #3315
---
.github/actions/kamel-build-bundle/build-bundle-image.sh | 4 ++--
.github/actions/kamel-build-bundle/build-index-image.sh | 4 ++--
script/Makefile | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/actions/kamel-build-bundle/build-bundle-image.sh b/.github/actions/kamel-build-bundle/build-bundle-image.sh
index 575ada06d..4ad2e7b6e 100755
--- a/.github/actions/kamel-build-bundle/build-bundle-image.sh
+++ b/.github/actions/kamel-build-bundle/build-bundle-image.sh
@@ -106,9 +106,9 @@ popd
export LOCAL_IMAGE_BUNDLE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION}
export CUSTOM_IMAGE=${IMAGE_NAME}
-export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d.\d')"
+export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d.\d+')"
echo "PREV_XY_CHANNEL=${PREV_XY_CHANNEL}" >> $GITHUB_ENV
-export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d.\d")
+export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d.\d+")
echo "NEW_XY_CHANNEL=${NEW_XY_CHANNEL}" >> $GITHUB_ENV
make bundle-build \
diff --git a/.github/actions/kamel-build-bundle/build-index-image.sh b/.github/actions/kamel-build-bundle/build-index-image.sh
index ecd5e4c1c..146d08ba4 100755
--- a/.github/actions/kamel-build-bundle/build-index-image.sh
+++ b/.github/actions/kamel-build-bundle/build-index-image.sh
@@ -211,10 +211,10 @@ cat << EOF >> ${CATALOG_DIR}/camel-k.yaml
---
schema: olm.channel
package: camel-k
-name: stable-dev-$(make get-version | grep -Po "\d.\d")
+name: stable-dev-$(make get-version | grep -Po "\d.\d+")
entries:
- name: $(make get-csv-name)
- replaces: $(make get-last-released-img-name).v$(make get-last-released-version | grep -Po "\d.\d.\d")
+ replaces: $(make get-last-released-img-name).v$(make get-last-released-version | grep -Po "\d.\d+.\d+")
EOF
#
diff --git a/script/Makefile b/script/Makefile
index 5fadb9154..9f41ca96e 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -524,6 +524,8 @@ pre-bundle:
@sed -i '/ version: ${CSV_VERSION}/a \ \ replaces: $(CSV_REPLACES)' $(CSV_PATH)
bundle: set-version generate-crd $(BUNDLE_CAMEL_APIS) kustomize operator-sdk pre-bundle
+ @# Display BUNDLE_METADATA_OPTS for debugging
+ $(info BUNDLE_METADATA_OPTS=$(BUNDLE_METADATA_OPTS))
@# Sets the operator image to the preferred image:tag
@cd config/manifests && $(KUSTOMIZE) edit set image $(IMAGE_NAME)=$(CUSTOM_IMAGE):$(CUSTOM_VERSION)
@# Build kustomize manifests