This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 03f53c51b42954b1a0dd023661e3fad717f4f7d1 Author: Nicola Ferraro <[email protected]> AuthorDate: Wed Jun 10 15:31:11 2020 +0200 chore(release): create release-1.0.x branch --- .../builds.camel.apache.org.crd.yaml | 65 +++ ...el-k.v1.0.1-snapshot.clusterserviceversion.yaml | 471 +++++++++++++++++++++ .../camelcatalogs.camel.apache.org.crd.yaml | 47 +- .../integrationkits.camel.apache.org.crd.yaml} | 46 +- ...integrationplatforms.camel.apache.org.crd.yaml} | 38 +- .../integrations.camel.apache.org.crd.yaml | 59 +++ .../camel-k-dev/camel-k-dev.package.yaml | 2 +- helm/camel-k/Chart.yaml | 4 +- helm/camel-k/values.yaml | 2 +- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 6 +- 11 files changed, 708 insertions(+), 34 deletions(-) diff --git a/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/builds.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/builds.camel.apache.org.crd.yaml new file mode 100644 index 0000000..4739c7e --- /dev/null +++ b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/builds.camel.apache.org.crd.yaml @@ -0,0 +1,65 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: builds.camel.apache.org + labels: + app: "camel-k" +spec: + group: camel.apache.org + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true + - name: v1alpha1 + served: true + storage: false + names: + kind: Build + listKind: BuildList + plural: builds + singular: build + subresources: + status: {} + additionalPrinterColumns: + - name: Phase + type: string + description: The build phase + JSONPath: .status.phase + - name: Age + type: date + description: The time at which the build was created + JSONPath: .metadata.creationTimestamp + - name: Started + type: date + description: The time at which the build was last (re-)started + JSONPath: .status.startedAt + - name: Duration + type: string + # Change when CRD uses OpenAPI spec v3 + # https://github.com/OAI/OpenAPI-Specification/issues/845 + # format: duration + description: The build last execution duration + JSONPath: .status.duration + - name: Attempts + type: integer + description: The number of execution attempts + JSONPath: .status.failure.recovery.attempt diff --git a/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/camel-k.v1.0.1-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/camel-k.v1.0.1-snapshot.clusterserviceversion.yaml new file mode 100644 index 0000000..36fd7fb --- /dev/null +++ b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/camel-k.v1.0.1-snapshot.clusterserviceversion.yaml @@ -0,0 +1,471 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + alm-examples: |- + [{ + "apiVersion": "camel.apache.org/v1", + "kind": "IntegrationPlatform", + "metadata": { + "name": "example" + }, + "spec": {} + }, + { + "apiVersion": "camel.apache.org/v1", + "kind": "Integration", + "metadata": { + "name": "example" + }, + "spec": { + "flows": [ + { + "from": { + "uri": "timer:yaml", + "parameters": { + "period": "1000" + }, + "steps": [ + { + "set-body": { + "constant": "Hello from Camel K" + } + }, + { + "to": "log:info" + } + ] + } + } + ] + } + }, + { + "apiVersion": "camel.apache.org/v1", + "kind": "IntegrationKit", + "metadata": { + "name": "example" + }, + "spec": {} + }, + { + "apiVersion": "camel.apache.org/v1", + "kind": "CamelCatalog", + "metadata": { + "name": "example" + }, + "spec": {} + }, + { + "apiVersion": "camel.apache.org/v1", + "kind": "Build", + "metadata": { + "name": "example" + }, + "spec": {} + }] + capabilities: Basic Install + categories: Integration & Delivery + certified: "false" + containerImage: docker.io/apache/camel-k:1.0.1-SNAPSHOT + createdAt: "2019-07-26T02:45:00Z" + description: Apache Camel K is a lightweight integration platform, born on Kubernetes, + with serverless superpowers. + repository: https://github.com/apache/camel-k + operators.operatorframework.io/internal-objects: '["builds.camel.apache.org","integrationkits.camel.apache.org","camelcatalogs.camel.apache.org"]' + support: Camel + name: camel-k-operator.v1.0.1-snapshot + namespace: placeholder +spec: + apiservicedefinitions: {} + customresourcedefinitions: + owned: + - description: A Camel K build + displayName: Build + kind: Build + name: builds.camel.apache.org + version: v1 + - description: A Camel catalog + displayName: Camel Catalog + kind: CamelCatalog + name: camelcatalogs.camel.apache.org + version: v1 + - description: A Camel K integration + displayName: Integration + kind: Integration + name: integrations.camel.apache.org + version: v1 + - description: A Camel K integration kit + displayName: Integration Kit + kind: IntegrationKit + name: integrationkits.camel.apache.org + version: v1 + - description: A Camel K integration platform + displayName: Integration Platform + kind: IntegrationPlatform + name: integrationplatforms.camel.apache.org + version: v1 + description: | + Apache Camel K + ============== + + Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers. + + ## Installation + + To start using Camel K, install the operator and then create the following `IntegrationPlatform`: + ``` + apiVersion: camel.apache.org/v1 + kind: IntegrationPlatform + metadata: + name: camel-k + labels: + app: "camel-k" + ``` + + ## Running an Integration + + After the initial setup, you can run a Camel integration on the cluster by creating an example `Integration`: + ``` + apiVersion: camel.apache.org/v1 + kind: Integration + metadata: + name: example + spec: + sources: + - content: | + import org.apache.camel.builder.RouteBuilder; + + public class Example extends RouteBuilder { + @Override + public void configure() throws Exception { + from("timer:tick") + .setBody(constant("Hello World!")) + .to("log:info?skipBodyLineSeparator=false"); + } + } + name: Example.java + ``` + displayName: Camel K Operator + icon: + - base64data: PHN2ZyB2aWV3Qm94PSIwIDAgMTMwLjIxIDEzMC4wMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZGVmcz48bGluZWFyR3JhZGllbnQgaWQ9ImEiIHgxPSIzMzMuNDgiIHgyPSI0NzciIHkxPSI3MDIuNiIgeTI9IjU2My43MyIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSg5NC4wMzggMjc2LjA2KSBzY2FsZSguOTkyMDYpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agc3RvcC1jb2xvcj0iI0Y2OTkyMyIgb2Zmc2V0PSIwIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0Y3OUEyMyIgb2Zmc2V0PSIuMTEiLz48c3RvcCBzdG9wLWNvbG9yPSIjRTk3ODI2IiBvZmZzZXQ9Ii45NDUiLz48L2xp [...] + mediatype: image/svg+xml + install: + spec: + clusterPermissions: + - rules: + - apiGroups: + - console.openshift.io + resources: + - consoleclidownloads + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - camel.apache.org + resources: + - '*' + verbs: + - '*' + serviceAccountName: camel-k-operator + deployments: + - name: camel-k-operator + spec: + replicas: 1 + selector: + matchLabels: + name: camel-k-operator + strategy: + type: Recreate + template: + metadata: + labels: + app: camel-k + camel.apache.org/component: operator + name: camel-k-operator + spec: + containers: + - command: + - kamel + - operator + env: + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.annotations['olm.targetNamespaces'] + - name: OPERATOR_NAME + value: camel-k + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + image: docker.io/apache/camel-k:1.0.1-SNAPSHOT + imagePullPolicy: IfNotPresent + name: camel-k-operator + resources: {} + serviceAccountName: camel-k-operator + permissions: + - rules: + - apiGroups: + - camel.apache.org + resources: + - '*' + verbs: + - '*' + - apiGroups: + - "" + resources: + - pods + - services + - endpoints + - persistentvolumeclaims + - configmaps + - secrets + - serviceaccounts + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - rbac.authorization.k8s.io + resources: + - roles + - rolebindings + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch + - get + - list + - watch + - apiGroups: + - apps + resources: + - deployments + - replicasets + - statefulsets + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - batch + resources: + - cronjobs + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - apps + resources: + - daemonsets + verbs: + - get + - list + - watch + - apiGroups: + - extensions + resources: + - ingresses + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + - build.openshift.io + resources: + - buildconfigs + - buildconfigs/webhooks + - builds + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + - image.openshift.io + resources: + - imagestreamimages + - imagestreammappings + - imagestreams + - imagestreams/secrets + - imagestreamtags + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + - build.openshift.io + resources: + - buildconfigs/instantiate + - buildconfigs/instantiatebinary + - builds/clone + verbs: + - create + - apiGroups: + - "" + - route.openshift.io + resources: + - routes + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + - route.openshift.io + resources: + - routes/custom-host + verbs: + - create + - apiGroups: + - serving.knative.dev + resources: + - services + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - eventing.knative.dev + - messaging.knative.dev + resources: + - '*' + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + serviceAccountName: camel-k-operator + strategy: deployment + installModes: + - supported: true + type: OwnNamespace + - supported: true + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: true + type: AllNamespaces + keywords: + - apache + - kamel + - kubernetes + - serverless + - microservices + labels: + name: camel-k-operator + links: + - name: Camel K source code repository + url: https://github.com/apache/camel-k + maintainers: + - email: [email protected] + name: The Apache Software Foundation + maturity: alpha + minKubeVersion: 1.11.0 + provider: + name: The Apache Software Foundation + replaces: camel-k-operator.v1.0.0 + selector: + matchLabels: + name: camel-k-operator + version: 1.0.1-snapshot diff --git a/helm/camel-k/values.yaml b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/camelcatalogs.camel.apache.org.crd.yaml similarity index 54% copy from helm/camel-k/values.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/camelcatalogs.camel.apache.org.crd.yaml index 0829b74..a4f43a7 100644 --- a/helm/camel-k/values.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/camelcatalogs.camel.apache.org.crd.yaml @@ -15,16 +15,39 @@ # limitations under the License. # --------------------------------------------------------------------------- -# Default values for camel-k. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: camelcatalogs.camel.apache.org + labels: + app: "camel-k" +spec: + group: camel.apache.org + names: + kind: CamelCatalog + listKind: CamelCatalogList + plural: camelcatalogs + singular: camelcatalog + shortNames: + - cc + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true + - name: v1alpha1 + served: true + storage: false + subresources: + status: {} + additionalPrinterColumns: + - name: Camel Version + type: string + description: The Camel version + JSONPath: .spec.version + - name: Runtime Version + type: string + description: The Camel K Runtime version + JSONPath: .spec.runtimeVersion -nameOverride: "" -fullnameOverride: "" - -operator: - image: docker.io/apache/camel-k:1.0.0 - -platform: - build: - registry: {} diff --git a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrationkits.camel.apache.org.crd.yaml similarity index 50% copy from deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrationkits.camel.apache.org.crd.yaml index e4ccd22..f8547d8 100644 --- a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrationkits.camel.apache.org.crd.yaml @@ -15,10 +15,42 @@ # limitations under the License. # --------------------------------------------------------------------------- -channels: -- currentCSV: camel-k-operator.v1.0.0 - name: stable -- currentCSV: camel-k-operator.v1.0.0-rc2 - name: alpha -defaultChannel: stable -packageName: camel-k-dev +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: integrationkits.camel.apache.org + labels: + app: "camel-k" +spec: + group: camel.apache.org + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true + - name: v1alpha1 + served: true + storage: false + subresources: + status: {} + names: + kind: IntegrationKit + listKind: IntegrationKitList + plural: integrationkits + singular: integrationkit + shortNames: + - ik + additionalPrinterColumns: + - name: Phase + type: string + description: The IntegrationKit phase + JSONPath: .status.phase + - name: Type + type: string + description: The IntegrationKit type + JSONPath: .metadata.labels.camel\.apache\.org\/kit\.type + - name: Image + type: string + description: The IntegrationKit image + JSONPath: .status.image diff --git a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrationplatforms.camel.apache.org.crd.yaml similarity index 57% copy from deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrationplatforms.camel.apache.org.crd.yaml index e4ccd22..c693199 100644 --- a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrationplatforms.camel.apache.org.crd.yaml @@ -15,10 +15,34 @@ # limitations under the License. # --------------------------------------------------------------------------- -channels: -- currentCSV: camel-k-operator.v1.0.0 - name: stable -- currentCSV: camel-k-operator.v1.0.0-rc2 - name: alpha -defaultChannel: stable -packageName: camel-k-dev +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: integrationplatforms.camel.apache.org + labels: + app: "camel-k" +spec: + group: camel.apache.org + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true + - name: v1alpha1 + served: true + storage: false + subresources: + status: {} + names: + kind: IntegrationPlatform + listKind: IntegrationPlatformList + plural: integrationplatforms + singular: integrationplatform + shortNames: + - ip + additionalPrinterColumns: + - name: Phase + type: string + description: The IntegrationPlatform phase + JSONPath: .status.phase diff --git a/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrations.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrations.camel.apache.org.crd.yaml new file mode 100644 index 0000000..41797cb --- /dev/null +++ b/deploy/olm-catalog/camel-k-dev/1.0.1-snapshot/integrations.camel.apache.org.crd.yaml @@ -0,0 +1,59 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: integrations.camel.apache.org + labels: + app: "camel-k" +spec: + group: camel.apache.org + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true + - name: v1alpha1 + served: true + storage: false + subresources: + status: {} + scale: + specReplicasPath: .spec.replicas + statusReplicasPath: .status.replicas + names: + kind: Integration + listKind: IntegrationList + plural: integrations + singular: integration + shortNames: + - it + additionalPrinterColumns: + - name: Phase + type: string + description: The integration phase + JSONPath: .status.phase + - name: Kit + type: string + description: The integration kit + JSONPath: .status.kit + - name: Replicas + type: integer + description: The number of pods + JSONPath: .status.replicas diff --git a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml b/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml index e4ccd22..916543f 100644 --- a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml +++ b/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- channels: -- currentCSV: camel-k-operator.v1.0.0 +- currentCSV: camel-k-operator.v1.0.1-snapshot name: stable - currentCSV: camel-k-operator.v1.0.0-rc2 name: alpha diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index 173e71a..767c726 100644 --- a/helm/camel-k/Chart.yaml +++ b/helm/camel-k/Chart.yaml @@ -31,11 +31,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.1 +version: 0.3.1 # 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.0.0 +appVersion: 1.0.1-SNAPSHOT icon: https://github.com/apache/camel/raw/master/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 0829b74..73d9f02 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.0.0 + image: docker.io/apache/camel-k:1.0.1-SNAPSHOT platform: build: diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index dd70bd9..44cc5e8 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -23,7 +23,7 @@ package defaults const ( // Version -- - Version = "1.0.0" + Version = "1.0.1-SNAPSHOT" // DefaultRuntimeVersion -- DefaultRuntimeVersion = "1.3.0" diff --git a/script/Makefile b/script/Makefile index 6826a4c..d76275c 100644 --- a/script/Makefile +++ b/script/Makefile @@ -14,8 +14,8 @@ # limitations under the License. VERSIONFILE := pkg/util/defaults/defaults.go -VERSION := 1.0.0 -LAST_RELEASED_VERSION := 1.0.0-RC2 +VERSION := 1.0.1-SNAPSHOT +LAST_RELEASED_VERSION := 1.0.0 RUNTIME_VERSION := 1.3.0 BUILDAH_VERSION := 1.14.0 KANIKO_VERSION := 0.17.1 @@ -30,7 +30,7 @@ LINT_DEADLINE := 10m # Used to push pre-release artifacts STAGING_IMAGE_NAME := docker.io/camelk/camel-k -STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1219 +STAGING_RUNTIME_REPO := # When packaging artifacts into the docker image, you can "copy" them from local maven # or "download" them from Apache Snapshots and Maven Central
