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 7caae6d4030b91df76c16436ad9c941a5b71efc1
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Thu Aug 6 13:14:55 2020 +0200
Fix #1548: switch to staged runtime
---
...HOT-main.yaml => camel-catalog-1.5.0-main.yaml} | 6 +++---
...arkus.yaml => camel-catalog-1.5.0-quarkus.yaml} | 6 +++---
deploy/resources.go | 24 +++++++++++-----------
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 4 ++--
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/deploy/camel-catalog-1.5.0-SNAPSHOT-main.yaml
b/deploy/camel-catalog-1.5.0-main.yaml
similarity index 99%
rename from deploy/camel-catalog-1.5.0-SNAPSHOT-main.yaml
rename to deploy/camel-catalog-1.5.0-main.yaml
index 1ce39cb..a63de4c 100644
--- a/deploy/camel-catalog-1.5.0-SNAPSHOT-main.yaml
+++ b/deploy/camel-catalog-1.5.0-main.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.5.0-snapshot-main
+ name: camel-catalog-1.5.0-main
labels:
app: camel-k
camel.apache.org/catalog.version: 3.4.0
camel.apache.org/catalog.loader.version: 3.4.0
- camel.apache.org/runtime.version: 1.5.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.5.0
camel.apache.org/runtime.provider: main
spec:
runtime:
- version: 1.5.0-SNAPSHOT
+ version: 1.5.0
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
diff --git a/deploy/camel-catalog-1.5.0-SNAPSHOT-quarkus.yaml
b/deploy/camel-catalog-1.5.0-quarkus.yaml
similarity index 99%
rename from deploy/camel-catalog-1.5.0-SNAPSHOT-quarkus.yaml
rename to deploy/camel-catalog-1.5.0-quarkus.yaml
index 113288e..dc862bb 100644
--- a/deploy/camel-catalog-1.5.0-SNAPSHOT-quarkus.yaml
+++ b/deploy/camel-catalog-1.5.0-quarkus.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.5.0-snapshot-quarkus
+ name: camel-catalog-1.5.0-quarkus
labels:
app: camel-k
camel.apache.org/catalog.version: 3.4.0
camel.apache.org/catalog.loader.version: 3.4.0
- camel.apache.org/runtime.version: 1.5.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.5.0
camel.apache.org/runtime.provider: quarkus
spec:
runtime:
- version: 1.5.0-SNAPSHOT
+ version: 1.5.0
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
diff --git a/deploy/resources.go b/deploy/resources.go
index cdd0e08..5dc0525 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -88,19 +88,19 @@ var assets = func() http.FileSystem {
compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x3d\x6f\xdb\x30\x14\xdc\xf9\x2b\x0e\xd6\x92\x00\xfe\x68\x3b\xba\x93\x9a\xd8\xa8\xd0\xc0\x06\x22\xa7\x41\xc6\x67\xf1\x59\x7a\x08\x45\xaa\x24\x15\xc5\xff\xbe\xa0\x6c\x37\x09\xba\x86\x9b\xa0\xd3\x7d\xf0\x4e\x19\x66\x9f\x77\x54\x86\x3b\xa9\xd8\x06\xd6\x88\x0e\xb1\x61\xe4\x1d\x55\x0d\xa3\x74\x87\x38\x90\x67\xac\x5d\x6f\x35\x45\x71\x16\x57\x79\xb9\xbe\x46\x6f\x35\x7b\x38\xcb\x70\x1e\xad\xf3\xac\x32\x54\xce\x46\x2f\x
[...]
},
- "/camel-catalog-1.5.0-SNAPSHOT-main.yaml":
&vfsgen۰CompressedFileInfo{
- name:
"camel-catalog-1.5.0-SNAPSHOT-main.yaml",
+ "/camel-catalog-1.5.0-main.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.5.0-main.yaml",
modTime: time.Time{},
- uncompressedSize: 89178,
+ uncompressedSize: 89151,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x86\x35\x3d\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf2\x24\x99\x7e\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x92\x65\xff\xfa\xb3\x70\xe1\x55\x10\x24\x12\x86\xd7\xf6\x83\x49\x11\x55\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x14\xbf\xde\xdf\xbb\xf7\xd1\x35\x49\x70\xc1\x71\x1a\x09\x1a\x89\x25\x8e\x4e\x4b\x94\x2c\x71\x34\xa5\x73\xf1\x84\x18\x8e\x2e\xe8\xba\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x35\x3d\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf2\x24\x99\x7e\xe9\x05\x91\x90\x04\x89\x24\x68\x00\xba\xd8\xbf\xfe\x2c\x5c\x78\x15\x04\x89\x84\xe1\xb5\xfd\x60\x52\x44\xd5\x57\x2c\x82\xc4\xa5\x50\xa8\x7a\x1f\x8d\x5e\xef\xef\xdd\xfb\xe8\x96\xc4\x38\xe7\x38\x89\x04\x8d\xc4\x02\x47\xe7\x05\x8a\x17\x38\x9a\xd0\x99\xd8\x22\x86\xa3\x2b\xba\xce\x
[...]
},
- "/camel-catalog-1.5.0-SNAPSHOT-quarkus.yaml":
&vfsgen۰CompressedFileInfo{
- name:
"camel-catalog-1.5.0-SNAPSHOT-quarkus.yaml",
+ "/camel-catalog-1.5.0-quarkus.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.5.0-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 49034,
+ uncompressedSize: 49007,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5f\x77\xdb\x2c\xf2\xff\x7d\x5e\x85\x4e\x73\xb3\x7b\xce\x23\x9e\x6e\xba\xfb\x5c\xf4\x77\x95\xa4\x4d\x9b\xb4\x49\xd3\x38\xdb\x76\x9f\x9b\x1e\x2c\x61\x9b\x58\x02\x05\x90\xed\xe4\xd5\xff\x0e\x08\x59\x92\xad\x8c\xfe\x04\xfc\xcd\x45\x24\x8b\xe1\x33\x30\x20\x18\x0d\x33\x70\x1c\x84\xee\xfe\x8e\x8e\x83\xaf\x34\x22\x4c\x92\x38\x50\x3c\x50\x0b\x12\x9c\x66\x38\x5a\x90\x60\xc2\x67\x6a\x8d\x05\x09\x2e\x78\xce\x62\xac\x28\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\xaa\xf2\xf7\x7d\x3e\x85\x56\x73\x73\xce\x5a\x5b\xec\x9e\xf4\xec\x7d\xd1\xe7\x2a\x49\x9b\xee\xa4\x4d\x9a\xc6\x39\x6d\xf7\xbe\xe9\xc2\x12\xb6\x89\x25\x50\x00\xd9\x4e\x3e\xfd\xb3\x40\xc8\x92\x6c\x65\xf4\x12\xf0\x3f\x17\x91\x2c\x86\xdf\xc0\x80\x60\x34\xcc\xc0\x71\x10\xba\xfb\x3b\x3a\x0e\xbe\xd0\x88\x30\x49\xe2\x40\xf1\x40\x2d\x48\x70\x9a\xe1\x68\x41\x82\x09\x9f\xa9\x35\x16\x24\xb8\xe0\x39\x8b\xb1\xa2\x
[...]
},
"/cr-example.yaml": &vfsgen۰CompressedFileInfo{
name: "cr-example.yaml",
@@ -354,9 +354,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 31960,
+ uncompressedSize: 32177,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3d\xfd\x73\x1b\x37\x76\xbf\xe7\xaf\xc0\xa8\x9d\x91\xa8\x21\x57\x72\x6e\x72\xc9\xa9\x4d\x33\xaa\xe3\xdc\xc9\x89\x6d\xd5\x72\x92\x76\xd2\x9b\x23\xb8\xfb\x48\xc2\xc2\x02\x7b\x00\x96\x32\xd3\xe9\xff\xde\x79\x0f\x1f\x8b\x5d\xae\x24\xca\xb1\x32\xba\x99\x4e\x7e\x88\x49\xed\x3e\x3c\x3c\xbc\xef\x0f\xd0\x19\x2e\x9c\x3d\xfb\x6c\xc6\x14\xaf\xe1\x8c\xf1\xe5\x52\x28\xe1\xb6\x9f\x31\xd6\x48\xee\x96\xda\xd4\x67\x6c\xc9\xa5\x05\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x73\x1b\x37\x92\xf0\xf7\xfc\x0a\x94\x9e\xa7\x4a\xa2\x8a\x1c\xc9\xd9\xca\x26\xab\xbb\x5c\x4a\xeb\x38\xbb\x72\x62\x5b\x67\x39\xc9\x5d\xe5\xb6\x96\xe0\x4c\x93\x84\x85\x01\x66\x01\x0c\x65\xe6\xea\xfe\xfb\x55\x37\x5e\x06\x33\x1c\x49\x94\x63\xa5\xb4\x55\x57\xf9\x10\x93\x9a\x69\x34\x1a\xfd\xfe\x02\x3a\xc3\x85\xb3\x67\x9f\xcd\x98\xe2\x35\x9c\x31\xbe\x5c\x0a\x25\xdc\xf6\x33\xc6\x1a\xc9\xdd\x52\x9b\xfa\x8c\x2d\xb9\x
[...]
},
"/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{
name: "user-cluster-role.yaml",
@@ -372,8 +372,8 @@ var assets = func() http.FileSystem {
fs["/builder-role-kubernetes.yaml"].(os.FileInfo),
fs["/builder-role-openshift.yaml"].(os.FileInfo),
fs["/builder-service-account.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.5.0-SNAPSHOT-main.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.5.0-SNAPSHOT-quarkus.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.5.0-main.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.5.0-quarkus.yaml"].(os.FileInfo),
fs["/cr-example.yaml"].(os.FileInfo),
fs["/crd-build.yaml"].(os.FileInfo),
fs["/crd-camel-catalog.yaml"].(os.FileInfo),
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 0b1e481..9a52d8b 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.1.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.5.0-SNAPSHOT"
+ DefaultRuntimeVersion = "1.5.0"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 56f433c..52ce382 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.1.0-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.1
-RUNTIME_VERSION := 1.5.0-SNAPSHOT
+RUNTIME_VERSION := 1.5.0
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk11:slim
@@ -30,7 +30,7 @@ LINT_DEADLINE := 10m
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO :=
+STAGING_RUNTIME_REPO :=
https://repository.apache.org/content/repositories/orgapachecamel-1237
# When packaging artifacts into the docker image, you can "copy" them from
local maven
# or "download" them from Apache Snapshots and Maven Central
