Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): bump version to 1.6.0-SNAPSHOT and remove deprecated … #2510

Merged
merged 4 commits into from Jul 17, 2021

Conversation

nicolaferraro
Copy link
Member

…OLM format

Release Note

NONE

Copy link
Contributor

@squakez squakez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

script/Makefile Outdated
@@ -14,7 +14,7 @@
# limitations under the License.

VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.6.0-SNAPSHOT
VERSION := 1.6.0-SNAPSHOT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this not be changed since this is relied upon for using the kustomize installation method I've been working on at #2284.

script/Makefile Outdated
@@ -23,7 +23,7 @@ KANIKO_VERSION := 0.17.1
INSTALL_DEFAULT_KAMELETS := true
BASE_IMAGE := adoptopenjdk/openjdk11:slim
LOCAL_REPOSITORY := /tmp/artifacts/m2
IMAGE_NAME ?= docker.io/apache/camel-k
IMAGE_NAME := docker.io/apache/camel-k
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. See above.

createdAt: 2021-05-03T07:48:00Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.3.0
operators.operatorframework.io/internal-objects: '["builds.camel.apache.org","integrationkits.camel.apache.org","camelcatalogs.camel.apache.org"]'
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
repository: https://github.com/apache/camel-k
support: Camel
name: camel-k.v1.5.0
name: camel-k.v1.6.0-snapshot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If memory serves, you cannot suffix this with -snapshot as operator-sdk considers it not to conform with semver syntax.

@phantomjinx
Copy link
Contributor

Have provided a commit to go on top of this PR at https://github.com/phantomjinx/camel-k/tree/pr-2510. Feel free to review and apply as required.

*  clusterserviceversion.yaml
 * Snapshot suffix violates semver restrictions of operator-sdk

* Makefile
 * Restore overriding of VERSION & IMAGE_NAME for use with kustomize install
 * Restricts the add_license.sh to stop the patch created by the e2e test
   receiving a licence header and failing to be applied correctly

* next_shapshot.sh
 * updates script to replace call to get_version.sh which no longer exists
@nicolaferraro
Copy link
Member Author

Have provided a commit to go on top of this PR at https://github.com/phantomjinx/camel-k/tree/pr-2510. Feel free to review and apply as required.

Cool, thanks!

@nicolaferraro nicolaferraro merged commit 7d0efc4 into apache:main Jul 17, 2021
@nicolaferraro nicolaferraro deleted the bump-1.6 branch July 17, 2021 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants