You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/02/27 08:48:25 UTC
[camel-k] branch release-1.12.x created (now c6dc2f980)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
at c6dc2f980 Next is 1.12.1-SNAPSHOT
This branch includes the following new commits:
new e6e309c42 Next for 1.12.x is 1.12.1
new c6dc2f980 Next is 1.12.1-SNAPSHOT
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.
[camel-k] 01/02: Next for 1.12.x is 1.12.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e6e309c42358b162c3420cb75e6c15abc74e7a21
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 27 09:45:37 2023 +0100
Next for 1.12.x is 1.12.1
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
config/manager/operator-deployment.yaml | 6 +++---
config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +-
helm/camel-k/Chart.yaml | 2 +-
helm/camel-k/values.yaml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml
index e824e3fab..e41f060f7 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.13.0-SNAPSHOT"
+ app.kubernetes.io/version: "1.12.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.13.0-SNAPSHOT"
+ app.kubernetes.io/version: "1.12.1-SNAPSHOT"
spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.13.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.12.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 77c33ab1f..5b8cf696c 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.13.0-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.12.1-SNAPSHOT
createdAt: 2022-12-12T09:20:24Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 5aa97f757..eec9cbd4c 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -35,7 +35,7 @@ version: 0.13.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.13.0-SNAPSHOT
+appVersion: 1.12.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 56e0e1566..88c19dc88 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.13.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.12.1-SNAPSHOT
global: "false"
resources: {}
securityContext: {}
[camel-k] 02/02: Next is 1.12.1-SNAPSHOT
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c6dc2f9807d8df813ef3cc9fb701a7855bc0084a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 27 09:48:04 2023 +0100
Next is 1.12.1-SNAPSHOT
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.github/workflows/automatic-updates.yml | 2 +-
.github/workflows/release.yml | 2 +-
config/manifests/bases/camel-k.clusterserviceversion.yaml | 8 ++++----
config/manifests/kustomization.yaml | 2 +-
java/pom.xml | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 8 ++++----
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml
index 766caa3e1..ba05c9421 100644
--- a/.github/workflows/automatic-updates.yml
+++ b/.github/workflows/automatic-updates.yml
@@ -41,7 +41,7 @@ jobs:
secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
goVersion: "1.18.x"
- v1_10_x:
+ v1_12_x:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9d6cee149..8105bc033 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,7 +50,7 @@ jobs:
secretDockerHubPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
- v1_10_x:
+ v1_12_x:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 5b8cf696c..9c47b3d03 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.12.1-SNAPSHOT
- createdAt: 2022-12-12T09:20:24Z
+ createdAt: 2023-02-27T08:47:56Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.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.12.0
+ name: camel-k.v1.12.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.11.0
+ replaces: camel-k-operator.v1.12.0
selector:
matchLabels:
name: camel-k-operator
- version: 1.12.0
+ version: 1.12.1
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
index 6da206206..5a53111e3 100644
--- a/config/manifests/kustomization.yaml
+++ b/config/manifests/kustomization.yaml
@@ -34,4 +34,4 @@ patchesStrategicMerge:
images:
- name: docker.io/apache/camel-k
newName: docker.io/apache/camel-k
- newTag: 1.12.0-SNAPSHOT
+ newTag: 1.12.1-SNAPSHOT
diff --git a/java/pom.xml b/java/pom.xml
index bee3a51d6..4c0bd26b8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-crds</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index f0321821c..fa1bcf659 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -23,7 +23,7 @@ package defaults
const (
// Version --
- Version = "1.12.0-SNAPSHOT"
+ Version = "1.12.1-SNAPSHOT"
// DefaultRuntimeVersion --
DefaultRuntimeVersion = "1.17.0"
diff --git a/script/Makefile b/script/Makefile
index c395f2000..428656b08 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -20,9 +20,9 @@
SHELL := /bin/bash
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION ?= 1.12.0-SNAPSHOT
+VERSION ?= 1.12.1-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
-LAST_RELEASED_VERSION ?= 1.11.1
+LAST_RELEASED_VERSION ?= 1.12.0
RUNTIME_VERSION := 1.17.0
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 0.17.1
@@ -79,13 +79,13 @@ OPM := opm
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1528/
+STAGING_RUNTIME_REPO :=
# Kamelets options
INSTALL_DEFAULT_KAMELETS ?= true
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Make sure to use a released tag or empty if you want to get the latest development bits
-KAMELET_CATALOG_REPO_TAG := v3.20.1.1
+KAMELET_CATALOG_REPO_TAG := main
# When performing integration tests, it is not necessary to always execute build, especially
# in e2e tests when lots of tests are being executed sequentially & the build has already taken place.