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:19 UTC

[camel-k] 05/05: Fix #683: switch to 1.0.0-M1-SNAPSHOT

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