You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/06/10 13:02:14 UTC
[camel-k] branch master updated (3c28936 -> 0e4e322)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 3c28936 Merge pull request #734 from apache/keys
new 24215fa Fix #683: add sha512 to binary files
new fdad9bd Fix #683: add staging workflow
new 17b6391 Fix #683: bump version to 0.4.0-SNAPSHOT
new 05ffab0 Fix #683: don't set version on olm catalog resources
new 0e4e322 Fix #683: switch to 1.0.0-M1-SNAPSHOT
The 5 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:
deploy/olm-catalog/camel-k.package.yaml | 2 +-
.../camel-k.v0.3.4.clusterserviceversion.yaml} | 8 +-
.../{0.3.4-SNAPSHOT => 0.3.4}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-context.yaml | 0
.../crd-integration-platform.yaml | 0
.../{0.3.4-SNAPSHOT => 0.3.4}/crd-integration.yaml | 0
....v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml} | 12 +-
.../camel-k/1.0.0-M1-SNAPSHOT}/crd-build.yaml | 0
.../1.0.0-M1-SNAPSHOT}/crd-camel-catalog.yaml | 0
.../crd-integration-context.yaml | 0
.../crd-integration-platform.yaml | 0
.../1.0.0-M1-SNAPSHOT}/crd-integration.yaml | 0
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 325 ++++++++++++++++++++-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 13 +-
script/cross_compile.sh | 2 +
script/set_version.sh | 2 +-
19 files changed, 351 insertions(+), 17 deletions(-)
copy deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml => 0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml} (98%)
rename deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT => 0.3.4}/crd-build.yaml (100%)
rename deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT => 0.3.4}/crd-camel-catalog.yaml (100%)
rename deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT => 0.3.4}/crd-integration-context.yaml (100%)
rename deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT => 0.3.4}/crd-integration-platform.yaml (100%)
rename deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT => 0.3.4}/crd-integration.yaml (100%)
rename deploy/olm-catalog/camel-k/{0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml => 1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml} (97%)
copy deploy/{ => olm-catalog/camel-k/1.0.0-M1-SNAPSHOT}/crd-build.yaml (100%)
copy deploy/{ => olm-catalog/camel-k/1.0.0-M1-SNAPSHOT}/crd-camel-catalog.yaml (100%)
copy deploy/{ => olm-catalog/camel-k/1.0.0-M1-SNAPSHOT}/crd-integration-context.yaml (100%)
copy deploy/{ => olm-catalog/camel-k/1.0.0-M1-SNAPSHOT}/crd-integration-platform.yaml (100%)
copy deploy/{ => olm-catalog/camel-k/1.0.0-M1-SNAPSHOT}/crd-integration.yaml (100%)
[camel-k] 03/05: Fix #683: bump version to 0.4.0-SNAPSHOT
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 17b63914a53e5593c6192ba05d98f477815b62e2
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Jun 7 16:42:29 2019 +0200
Fix #683: bump version to 0.4.0-SNAPSHOT
---
deploy/olm-catalog/camel-k.package.yaml | 2 +-
.../camel-k.v0.3.4.clusterserviceversion.yaml} | 8 +-
.../{0.3.4-SNAPSHOT => 0.3.4}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-context.yaml | 0
.../crd-integration-platform.yaml | 0
.../{0.3.4-SNAPSHOT => 0.3.4}/crd-integration.yaml | 0
...l-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml} | 12 +-
.../crd-build.yaml | 17 ++
.../0.4.0-SNAPSHOT/crd-camel-catalog.yaml} | 29 +-
.../0.4.0-SNAPSHOT/crd-integration-context.yaml} | 36 ++-
.../0.4.0-SNAPSHOT/crd-integration-platform.yaml} | 28 +-
.../0.4.0-SNAPSHOT/crd-integration.yaml} | 32 +-
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 325 ++++++++++++++++++++-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
17 files changed, 464 insertions(+), 31 deletions(-)
diff --git a/deploy/olm-catalog/camel-k.package.yaml b/deploy/olm-catalog/camel-k.package.yaml
index e061dab..59edc42 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k.package.yaml
@@ -18,4 +18,4 @@
packageName: camel-k
channels:
- name: alpha
- currentCSV: camel-k-operator.v0.3.4-SNAPSHOT
+ currentCSV: camel-k-operator.v0.4.0-SNAPSHOT
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml
similarity index 98%
copy from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml
copy to deploy/olm-catalog/camel-k/0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml
index a5af236..4f7e89f 100644
--- a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/0.3.4/camel-k.v0.3.4.clusterserviceversion.yaml
@@ -47,13 +47,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:0.3.4
createdAt: "2019-05-06T16:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v0.3.4-SNAPSHOT
+ name: camel-k-operator.v0.3.4
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -164,7 +164,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.3.4
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -377,4 +377,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 0.3.4-SNAPSHOT
+ version: 0.3.4
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-build.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
copy to deploy/olm-catalog/camel-k/0.3.4/crd-build.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-camel-catalog.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-integration-context.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-integration-context.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-integration-platform.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml b/deploy/olm-catalog/camel-k/0.3.4/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/0.3.4/crd-integration.yaml
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/camel-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml
similarity index 97%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml
rename to deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/camel-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml
index a5af236..f22e641 100644
--- a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/camel-k.v0.3.4-SNAPSHOT.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/camel-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml
@@ -47,13 +47,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:0.4.0-SNAPSHOT
createdAt: "2019-05-06T16:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v0.3.4-SNAPSHOT
+ name: camel-k-operator.v0.4.0-SNAPSHOT
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -153,7 +153,7 @@ spec:
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
- fieldPath: metadata.annotations['olm.targetNamespaces']
+ fieldPath: metadata.namespace
- name: OPERATOR_NAME
value: camel-k
- name: POD_NAME
@@ -164,7 +164,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.4.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -373,8 +373,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v0.3.3
+ replaces: camel-k-operator.v0.3.4
selector:
matchLabels:
name: camel-k-operator
- version: 0.3.4-SNAPSHOT
+ version: 0.4.0-SNAPSHOT
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-build.yaml
similarity index 51%
rename from deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
rename to deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-build.yaml
index 9459516..6cad421 100644
--- a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
+++ b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-build.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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:
diff --git a/deploy/olm-catalog/camel-k.package.yaml b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-camel-catalog.yaml
similarity index 63%
copy from deploy/olm-catalog/camel-k.package.yaml
copy to deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-camel-catalog.yaml
index e061dab..858bd0f 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-camel-catalog.yaml
@@ -15,7 +15,28 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-packageName: camel-k
-channels:
-- name: alpha
- currentCSV: camel-k-operator.v0.3.4-SNAPSHOT
+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: v1alpha1
+ subresources:
+ status: {}
+ additionalPrinterColumns:
+ - name: Version
+ type: string
+ description: The Catalog version
+ JSONPath: .spec.version
+
diff --git a/deploy/olm-catalog/camel-k.package.yaml b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-context.yaml
similarity index 52%
copy from deploy/olm-catalog/camel-k.package.yaml
copy to deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-context.yaml
index e061dab..ae67d41 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-context.yaml
@@ -15,7 +15,35 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-packageName: camel-k
-channels:
-- name: alpha
- currentCSV: camel-k-operator.v0.3.4-SNAPSHOT
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: integrationcontexts.camel.apache.org
+ labels:
+ app: "camel-k"
+spec:
+ group: camel.apache.org
+ scope: Namespaced
+ version: v1alpha1
+ subresources:
+ status: {}
+ names:
+ kind: IntegrationContext
+ listKind: IntegrationContextList
+ plural: integrationcontexts
+ singular: integrationcontext
+ shortNames:
+ - ictx
+ additionalPrinterColumns:
+ - name: Phase
+ type: string
+ description: The IntegrationContext phase
+ JSONPath: .status.phase
+ - name: Type
+ type: string
+ description: The IntegrationContext type
+ JSONPath: .metadata.labels.camel\.apache\.org\/context\.type
+ - name: Image
+ type: string
+ description: The IntegrationContext image
+ JSONPath: .status.image
diff --git a/deploy/olm-catalog/camel-k.package.yaml b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-platform.yaml
similarity index 62%
copy from deploy/olm-catalog/camel-k.package.yaml
copy to deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-platform.yaml
index e061dab..532ad86 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-platform.yaml
@@ -15,7 +15,27 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-packageName: camel-k
-channels:
-- name: alpha
- currentCSV: camel-k-operator.v0.3.4-SNAPSHOT
+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: v1alpha1
+ 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.package.yaml b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration.yaml
similarity index 59%
copy from deploy/olm-catalog/camel-k.package.yaml
copy to deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration.yaml
index e061dab..68d89f7 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration.yaml
@@ -15,7 +15,31 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-packageName: camel-k
-channels:
-- name: alpha
- currentCSV: camel-k-operator.v0.3.4-SNAPSHOT
+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: v1alpha1
+ subresources:
+ status: {}
+ names:
+ kind: Integration
+ listKind: IntegrationList
+ plural: integrations
+ singular: integration
+ shortNames:
+ - it
+ additionalPrinterColumns:
+ - name: Phase
+ type: string
+ description: The Integration phase
+ JSONPath: .status.phase
+ - name: Context
+ type: string
+ description: The IntegrationContext to use
+ JSONPath: .status.context
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 4857802..efa5ec2 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -38,7 +38,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.4.0-SNAPSHOT
command:
- camel-k
imagePullPolicy: IfNotPresent
diff --git a/deploy/resources.go b/deploy/resources.go
index c328be0..dbebd78 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -10633,6 +10633,23 @@ spec:
`
Resources["crd-build.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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:
@@ -10674,6 +10691,23 @@ spec:
`
Resources["crd-camel-catalog.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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:
@@ -10703,6 +10737,23 @@ spec:
`
Resources["crd-integration-context.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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:
@@ -10739,6 +10790,23 @@ spec:
`
Resources["crd-integration-platform.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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:
@@ -10767,6 +10835,23 @@ spec:
`
Resources["crd-integration.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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:
@@ -10799,6 +10884,23 @@ spec:
`
Resources["cr-example.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: camel.apache.org/v1alpha1
kind: Integration
metadata:
@@ -10822,6 +10924,23 @@ spec:
`
Resources["operator-deployment.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: apps/v1
kind: Deployment
metadata:
@@ -10845,7 +10964,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:0.3.4-SNAPSHOT
+ image: docker.io/apache/camel-k:0.4.0-SNAPSHOT
command:
- camel-k
imagePullPolicy: IfNotPresent
@@ -10869,6 +10988,23 @@ spec:
`
Resources["operator-role-binding-knative.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10886,6 +11022,23 @@ roleRef:
`
Resources["operator-role-binding.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10903,6 +11056,23 @@ roleRef:
`
Resources["operator-role-knative.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -10940,6 +11110,23 @@ rules:
`
Resources["operator-role-kubernetes.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -11221,6 +11408,23 @@ rules:
`
Resources["operator-role-openshift.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -11369,6 +11573,23 @@ rules:
`
Resources["operator-service-account.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: v1
kind: ServiceAccount
metadata:
@@ -11379,6 +11600,23 @@ metadata:
`
Resources["platform-cr.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: camel.apache.org/v1alpha1
kind: IntegrationPlatform
metadata:
@@ -11389,6 +11627,23 @@ metadata:
`
Resources["platform-integration-context-groovy.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11406,6 +11661,23 @@ spec:
`
Resources["platform-integration-context-jvm.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11422,6 +11694,23 @@ spec:
`
Resources["platform-integration-context-knative.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11440,6 +11729,23 @@ spec:
`
Resources["platform-integration-context-kotlin.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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: camel.apache.org/v1alpha1
kind: IntegrationContext
metadata:
@@ -11457,6 +11763,23 @@ spec:
`
Resources["user-cluster-role.yaml"] =
`
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 69d6a1a..d6efb32 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -22,7 +22,7 @@ package defaults
const (
// Version --
- Version = "0.3.4-SNAPSHOT"
+ Version = "0.4.0-SNAPSHOT"
// CamelVersionConstraint --
CamelVersionConstraint = "~2.24.x"
diff --git a/script/Makefile b/script/Makefile
index 09142df..b88b134 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 0.3.4-SNAPSHOT
+VERSION := 0.4.0-SNAPSHOT
RUNTIME_VERSION := 0.3.3
CAMEL_VERSION := 2.24.0
CAMEL_VERSION_CONSTRAINT := ~2.24.x
[camel-k] 05/05: Fix #683: switch to 1.0.0-M1-SNAPSHOT
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0e4e3225cd1f32cb9c698e97360d93075b02e39e
Author: nferraro <ni...@gmail.com>
AuthorDate: Mon Jun 10 11:34:23 2019 +0200
Fix #683: switch to 1.0.0-M1-SNAPSHOT
---
deploy/olm-catalog/camel-k.package.yaml | 2 +-
.../camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml} | 8 ++++----
.../camel-k/{0.4.0-SNAPSHOT => 1.0.0-M1-SNAPSHOT}/crd-build.yaml | 0
.../{0.4.0-SNAPSHOT => 1.0.0-M1-SNAPSHOT}/crd-camel-catalog.yaml | 0
.../crd-integration-context.yaml | 0
.../crd-integration-platform.yaml | 0
.../{0.4.0-SNAPSHOT => 1.0.0-M1-SNAPSHOT}/crd-integration.yaml | 0
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
11 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/deploy/olm-catalog/camel-k.package.yaml b/deploy/olm-catalog/camel-k.package.yaml
index 59edc42..1420dc7 100644
--- a/deploy/olm-catalog/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k.package.yaml
@@ -18,4 +18,4 @@
packageName: camel-k
channels:
- name: alpha
- currentCSV: camel-k-operator.v0.4.0-SNAPSHOT
+ currentCSV: camel-k-operator.v1.0.0-M1-SNAPSHOT
diff --git a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/camel-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
similarity index 98%
rename from deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/camel-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
index f22e641..d07fef5 100644
--- a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/camel-k.v0.4.0-SNAPSHOT.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
@@ -47,13 +47,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:0.4.0-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
createdAt: "2019-05-06T16:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v0.4.0-SNAPSHOT
+ name: camel-k-operator.v1.0.0-M1-SNAPSHOT
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -164,7 +164,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:0.4.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -377,4 +377,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 0.4.0-SNAPSHOT
+ version: 1.0.0-M1-SNAPSHOT
diff --git a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-build.yaml b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-build.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-build.yaml
diff --git a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-camel-catalog.yaml
diff --git a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-context.yaml b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-context.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
diff --git a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-platform.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration-platform.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration.yaml b/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/0.4.0-SNAPSHOT/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index efa5ec2..e7f8eb1 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -38,7 +38,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:0.4.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
command:
- camel-k
imagePullPolicy: IfNotPresent
diff --git a/deploy/resources.go b/deploy/resources.go
index dbebd78..31aad32 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -10964,7 +10964,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:0.4.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
command:
- camel-k
imagePullPolicy: IfNotPresent
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index d6efb32..1aacc05 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -22,7 +22,7 @@ package defaults
const (
// Version --
- Version = "0.4.0-SNAPSHOT"
+ Version = "1.0.0-M1-SNAPSHOT"
// CamelVersionConstraint --
CamelVersionConstraint = "~2.24.x"
diff --git a/script/Makefile b/script/Makefile
index b88b134..0f79d40 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 0.4.0-SNAPSHOT
+VERSION := 1.0.0-M1-SNAPSHOT
RUNTIME_VERSION := 0.3.3
CAMEL_VERSION := 2.24.0
CAMEL_VERSION_CONSTRAINT := ~2.24.x
[camel-k] 04/05: Fix #683: don't set version on olm catalog
resources
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 05ffab0f5e11d2552877b88a49bb30f4170c72fc
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Jun 7 16:43:35 2019 +0200
Fix #683: don't set version on olm catalog resources
---
script/set_version.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/script/set_version.sh b/script/set_version.sh
index d3f5394..72cc571 100755
--- a/script/set_version.sh
+++ b/script/set_version.sh
@@ -28,7 +28,7 @@ image_name=${2:-docker.io\/apache\/camel-k}
sanitized_image_name=${image_name//\//\\\/}
-for f in $(find $location/../deploy -type f -name "*.yaml");
+for f in $(find $location/../deploy -type f -name "*.yaml" | grep -v olm-catalog);
do
sed -i -r "s/docker.io\/apache\/camel-k:([0-9]+[a-zA-Z0-9\-\.].*).*/${sanitized_image_name}:${version}/" $f
done
[camel-k] 01/05: Fix #683: add sha512 to binary files
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 24215fa8c034c2e8a3afc48ff798c6aeeeadaa5d
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Jun 7 16:17:36 2019 +0200
Fix #683: add sha512 to binary files
---
script/cross_compile.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/script/cross_compile.sh b/script/cross_compile.sh
index b86d17d..001b4e9 100755
--- a/script/cross_compile.sh
+++ b/script/cross_compile.sh
@@ -47,6 +47,8 @@ cross_compile () {
gpg --output ${targetdir}/kamel${extension}.asc --armor --detach-sig --passphrase ${gpg_pass} ${targetdir}/kamel${extension}
fi
+ pushd . && cd ${targetdir} && sha512sum -b kamel${extension} > kamel${extension}.sha512 && popd
+
cp ${location}/../LICENSE ${targetdir}/
cp ${location}/../NOTICE ${targetdir}/
[camel-k] 02/05: Fix #683: add staging workflow
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fdad9bd6e1c51f9f633e88386541e1822412014c
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Jun 7 15:15:28 2019 +0200
Fix #683: add staging workflow
---
script/Makefile | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/script/Makefile b/script/Makefile
index 5c6b51c..09142df 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -27,6 +27,9 @@ GIT_COMMIT := $(shell git rev-list -1 HEAD)
# For signing binary artifacts
GPG_PASS := $(GPG_PASS)
+# Used to push pre-relase artifacts
+STAGING_IMAGE_NAME := docker.io/camelk/camel-k
+
GOLDFLAGS += -X main.GitCommit=$(GIT_COMMIT)
GOFLAGS = -ldflags "$(GOLDFLAGS)"
@@ -167,6 +170,10 @@ images-dev: test package-artifacts
images-push:
docker push $(IMAGE_NAME):$(VERSION)
+images-push-staging:
+ docker tag $(IMAGE_NAME):$(VERSION) $(STAGING_IMAGE_NAME):$(VERSION)
+ docker push $(STAGING_IMAGE_NAME):$(VERSION)
+
set-version:
./script/set_version.sh $(VERSION) $(IMAGE_NAME)
@@ -187,9 +194,11 @@ unsnapshot-olm:
release: clean codegen set-version build-resources unsnapshot-olm build images images-push cross-compile package-examples git-tag
+release-staging: clean codegen set-version build-resources unsnapshot-olm build images images-push-staging cross-compile package-examples git-tag
+
install-minishift:
./script/install_minishift.sh
install-minikube:
./script/install_minikube.sh
-.PHONY: build build-operator build-kamel build-resources build-builder build-olm unsnapshot-olm dep codegen images images-dec images-push test check test-integration clean release cross-compile package-examples set-version git-tag
+.PHONY: build build-operator build-kamel build-resources build-builder build-olm unsnapshot-olm dep codegen images images-dec images-push images-push-staging test check test-integration clean release cross-compile package-examples set-version git-tag