Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump to 2.0.0 #4081

Merged
merged 1 commit into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/nightly-automatic-updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions config/manager/operator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions config/manifests/bases/camel-k.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ 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
operators.operatorframework.io/internal-objects: '["builds.camel.apache.org","integrationkits.camel.apache.org","camelcatalogs.camel.apache.org"]'
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: {}
Expand Down Expand Up @@ -157,4 +157,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
version: 1.13.0
version: 2.0.0
2 changes: 1 addition & 1 deletion config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion helm/camel-k/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
12 changes: 6 additions & 6 deletions helm/camel-k/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions script/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down