From f8e38a00085fc5ce142e676834af68544116c499 Mon Sep 17 00:00:00 2001 From: Nicola Ferraro Date: Wed, 13 Nov 2019 15:58:34 +0100 Subject: [PATCH] Release 1.0.0-M4 --- .../camel-k.v1.0.0-m4.clusterserviceversion.yaml} | 6 +++--- .../camel-k/{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-build.yaml | 0 .../{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-camel-catalog.yaml | 0 .../crd-integration-kit.yaml | 0 .../crd-integration-platform.yaml | 0 .../{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-integration.yaml | 0 deploy/operator-deployment.yaml | 2 +- deploy/resources.go | 2 +- go.sum | 2 ++ pkg/util/defaults/defaults.go | 2 +- script/Makefile | 2 +- 11 files changed, 9 insertions(+), 7 deletions(-) rename deploy/olm-catalog/camel-k/{1.0.0-M4-SNAPSHOT/camel-k.v1.0.0-m4-SNAPSHOT.clusterserviceversion.yaml => 1.0.0-M4/camel-k.v1.0.0-m4.clusterserviceversion.yaml} (98%) rename deploy/olm-catalog/camel-k/{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-build.yaml (100%) rename deploy/olm-catalog/camel-k/{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-camel-catalog.yaml (100%) rename deploy/olm-catalog/camel-k/{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-integration-kit.yaml (100%) rename deploy/olm-catalog/camel-k/{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-integration-platform.yaml (100%) rename deploy/olm-catalog/camel-k/{1.0.0-M4-SNAPSHOT => 1.0.0-M4}/crd-integration.yaml (100%) diff --git a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/camel-k.v1.0.0-m4-SNAPSHOT.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/1.0.0-M4/camel-k.v1.0.0-m4.clusterserviceversion.yaml similarity index 98% rename from deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/camel-k.v1.0.0-m4-SNAPSHOT.clusterserviceversion.yaml rename to deploy/olm-catalog/camel-k/1.0.0-M4/camel-k.v1.0.0-m4.clusterserviceversion.yaml index e6eeb7fdcc..92456e7855 100644 --- a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/camel-k.v1.0.0-m4-SNAPSHOT.clusterserviceversion.yaml +++ b/deploy/olm-catalog/camel-k/1.0.0-M4/camel-k.v1.0.0-m4.clusterserviceversion.yaml @@ -66,13 +66,13 @@ metadata: capabilities: Basic Install categories: Integration & Delivery certified: "false" - containerImage: docker.io/apache/camel-k:1.0.0-M4-SNAPSHOT + containerImage: docker.io/apache/camel-k:1.0.0-M4 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 support: Camel - name: camel-k-operator.v1.0.0-m4-SNAPSHOT + name: camel-k-operator.v1.0.0-m4 namespace: placeholder spec: apiservicedefinitions: {} @@ -185,7 +185,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/apache/camel-k:1.0.0-M4-SNAPSHOT + image: docker.io/apache/camel-k:1.0.0-M4 imagePullPolicy: IfNotPresent name: camel-k-operator resources: {} diff --git a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-build.yaml b/deploy/olm-catalog/camel-k/1.0.0-M4/crd-build.yaml similarity index 100% rename from deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-build.yaml rename to deploy/olm-catalog/camel-k/1.0.0-M4/crd-build.yaml diff --git a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/1.0.0-M4/crd-camel-catalog.yaml similarity index 100% rename from deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-camel-catalog.yaml rename to deploy/olm-catalog/camel-k/1.0.0-M4/crd-camel-catalog.yaml diff --git a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-integration-kit.yaml b/deploy/olm-catalog/camel-k/1.0.0-M4/crd-integration-kit.yaml similarity index 100% rename from deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-integration-kit.yaml rename to deploy/olm-catalog/camel-k/1.0.0-M4/crd-integration-kit.yaml diff --git a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/1.0.0-M4/crd-integration-platform.yaml similarity index 100% rename from deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-integration-platform.yaml rename to deploy/olm-catalog/camel-k/1.0.0-M4/crd-integration-platform.yaml diff --git a/deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-integration.yaml b/deploy/olm-catalog/camel-k/1.0.0-M4/crd-integration.yaml similarity index 100% rename from deploy/olm-catalog/camel-k/1.0.0-M4-SNAPSHOT/crd-integration.yaml rename to deploy/olm-catalog/camel-k/1.0.0-M4/crd-integration.yaml diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml index 9ff5e03460..4939e62057 100644 --- a/deploy/operator-deployment.yaml +++ b/deploy/operator-deployment.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:1.0.0-M4-SNAPSHOT + image: docker.io/apache/camel-k:1.0.0-M4 command: - kamel - operator diff --git a/deploy/resources.go b/deploy/resources.go index c531fb9f01..872c22b593 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -9870,7 +9870,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:1.0.0-M4-SNAPSHOT + image: docker.io/apache/camel-k:1.0.0-M4 command: - kamel - operator diff --git a/go.sum b/go.sum index 3b69a143d7..05a5aed93e 100644 --- a/go.sum +++ b/go.sum @@ -284,6 +284,7 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -311,6 +312,7 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169/go.mod h1:glhvuHOU9Hy7/8PwwdtnarXqLagOX0b/TbZx2zLMqEg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index d677be3003..bef8a8d6e4 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -22,7 +22,7 @@ package defaults const ( // Version -- - Version = "1.0.0-M4-SNAPSHOT" + Version = "1.0.0-M4" // DefaultCamelVersion -- DefaultCamelVersion = "3.0.0-RC3" diff --git a/script/Makefile b/script/Makefile index 99e56e8121..e341322a92 100644 --- a/script/Makefile +++ b/script/Makefile @@ -14,7 +14,7 @@ # limitations under the License. VERSIONFILE := pkg/util/defaults/defaults.go -VERSION := 1.0.0-M4-SNAPSHOT +VERSION := 1.0.0-M4 LAST_RELEASED_VERSION := 1.0.0-M3 RUNTIME_VERSION := 1.0.7 RUNTIME_VERSION_CONSTRAINT := >=1.0.7