Skip to content

Conversation

@estroz
Copy link
Member

@estroz estroz commented Oct 11, 2018

Has useful annotations and makes the build workflow a bit easier.

* .gitignore,Makefile: added 'build' Makefile target to build a binary within project context (in 'build' dir), and .gitignore clause

* doc/release-versioning.md: rough draft of release and versioning semantics and mechanics

* Makefile: add mutiple build targets and reformat 'all' make target

* release.sh: tag and build release with a few pre-build checks

* Makefile: added signature make targets to run under release target

* doc/release-versioning.md: revised release process such that 'release.sh' automates everything from building multi-arch to signing

* Makefile: add '--tags' flag when retrieving version so the current tag is retrieved regardless of signature

* Makefile: ensure git and gpg are configured to have the same signing key

* doc/release-versioning.md: document supported k8s versions, architectures, and platforms in their own section

* release.sh,Makefile,pkg/generator/templates.go: check versions before tagging on release
@estroz estroz requested review from AlexNPavel and hasbro17 October 11, 2018 18:27
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 11, 2018
release.sh Outdated
TOML_TMPL_FILE="pkg/generator/templates.go"
CURR_VER_VER_FILE="$(sed -nr 's/Version = "(.+)"/\1/p' "$VER_FILE" | tr -d '\s\t\n')"
CURR_VER_TMPL_FILE="$(sed -nr 's/.*".*v(.+)".*#osdk_version_annotation/v\1/p' "$TOML_TMPL_FILE" | tr -d '\s\t\n')"
if [ "$CURR_VER" != "$CURR_VER_VER_FILE" ] \
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be comparing the desired version with verison.go. if [ "$VER" != "$CURR_VER_VER_FILE" ]
Say I'm trying to cut the tag for v0.0.7 and I've updated version.go and Gopkg.toml to v0.0.7.

But before this script can actually cut the tag, my current tag would be v0.0.6.
The current tag is something the script would update. The check should be to make sure version.go and Gopkg.toml are already updated to use the desired $VER.

@estroz estroz force-pushed the refactor/cherry-pick-versioning branch from 446ddea to 32f9916 Compare October 12, 2018 01:14
Copy link
Contributor

@AlexNPavel AlexNPavel left a comment

Choose a reason for hiding this comment

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

I think this is ready to merge now. The changes made here should also be backported to the master branch before doing the v0.0.7 release to make sure we can do a proper release on master before rebasing this branch over master.

@estroz estroz merged commit e0608bf into operator-framework:refactor/controller-runtime Oct 12, 2018
@estroz estroz deleted the refactor/cherry-pick-versioning branch October 12, 2018 20:18
shawn-hurley pushed a commit to shawn-hurley/operator-sdk that referenced this pull request Oct 12, 2018
… (operator-framework#604)

* .gitignore,Makefile: added 'build' Makefile target to build a binary within project context (in 'build' dir), and .gitignore clause

* Makefile: add mutiple build targets and reformat 'all' make target

* Makefile: added signature make targets to run under release target

* Makefile: ensure git and gpg are configured to have the same signing key

* doc/release-versioning.md: document supported k8s versions, architectures, and platforms in their own section

* release.sh,Makefile,pkg/generator/templates.go: check versions before tagging on release
shawn-hurley pushed a commit that referenced this pull request Oct 16, 2018
* .gitignore,Makefile: added 'build' Makefile target to build a binary within project context (in 'build' dir), and .gitignore clause

* Makefile: add mutiple build targets and reformat 'all' make target

* Makefile: added signature make targets to run under release target

* Makefile: ensure git and gpg are configured to have the same signing key

* doc/release-versioning.md: document supported k8s versions, architectures, and platforms in their own section

* release.sh,Makefile,pkg/generator/templates.go: check versions before tagging on release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants