diff --git a/.github/workflows/nightly-automatic-updates.yml b/.github/workflows/nightly-automatic-updates.yml
index b65cfa39da..2398991b60 100644
--- a/.github/workflows/nightly-automatic-updates.yml
+++ b/.github/workflows/nightly-automatic-updates.yml
@@ -58,19 +58,19 @@ jobs:
secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
goVersion: "1.17.x"
- v1_11_x:
+ v1_10_x:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
- name: "Checkout code"
uses: actions/checkout@v2
with:
- ref: release-1.11.x
+ ref: release-1.10.x
persist-credentials: false
submodules: recursive
- - name: Automatic updates on release-1.11.x
+ - name: Automatic updates on release-1.10.x
uses: ./.github/actions/automatic-updates
with:
- branch-ref: "release-1.11.x"
+ branch-ref: "release-1.10.x"
secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
goVersion: "1.17.x"
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 96f7aafc37..94ef0d89f7 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -71,7 +71,7 @@ jobs:
secretDockerHubPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
- v1_11_x:
+ v1_12_x:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml
index e824e3fab2..c64e205895 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: "2.0.0-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: "2.0.0-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:2.0.0-SNAPSHOT
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 18ef384da9..4a17396bf9 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/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:1.13.0-SNAPSHOT
- createdAt: 2023-02-27T08:48:34Z
+ containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
+ createdAt: 2023-02-27T14:43:33Z
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.13.0
+ name: camel-k.v2.0.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -157,4 +157,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 1.13.0
+ version: 2.0.0
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
index 3e6288ee1b..be2077c65a 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.13.0-SNAPSHOT
+ newTag: 2.0.0-SNAPSHOT
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 5aa97f757b..a5b7dceff3 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: 2.0.0-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 56e0e15661..2649fb66d3 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,29 +23,29 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:1.13.0-SNAPSHOT
+ image: docker.io/apache/camel-k:2.0.0-SNAPSHOT
global: "false"
resources: {}
securityContext: {}
tolerations: []
logLevel: "info"
-
+
## Deployment annotations
annotations:
# prometheus.io/path: /metrics
# prometheus.io/port: '8080'
- # prometheus.io/scrape: 'true'
+ # prometheus.io/scrape: 'true'
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
imagePullSecrets:
# - name: "image-pull-secret"
-
- # Default operator name
+
+ # Default operator name
operatorId: camel-k
-
+
platform:
build:
registry: {}
diff --git a/java/pom.xml b/java/pom.xml
index bee3a51d61..f399978b0f 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -25,7 +25,7 @@
4.0.0
org.apache.camel.k
camel-k-crds
- 1.13.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
jar
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 32abe0fd99..f9317fdf7d 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -23,10 +23,10 @@ package defaults
const (
// Version --
- Version = "1.13.0-SNAPSHOT"
+ Version = "2.0.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.17.0"
+ DefaultRuntimeVersion = "1.18.0-SNAPSHOT"
// BuildahVersion --
BuildahVersion = "1.23.3"
diff --git a/script/Makefile b/script/Makefile
index 473a21f157..1612d288a0 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -20,10 +20,10 @@
SHELL := /bin/bash
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION ?= 1.13.0-SNAPSHOT
+VERSION ?= 2.0.0-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 1.12.0
-RUNTIME_VERSION := 1.17.0
+RUNTIME_VERSION := 1.18.0-SNAPSHOT
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 0.17.1
CONTROLLER_GEN_VERSION := v0.6.1