Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Inject effective version into binary#96

Merged
rfranzke merged 1 commit into
gardener-attic:masterfrom
timebertt:enh/version
Dec 7, 2020
Merged

Inject effective version into binary#96
rfranzke merged 1 commit into
gardener-attic:masterfrom
timebertt:enh/version

Conversation

@timebertt
Copy link
Copy Markdown
Contributor

@timebertt timebertt commented Dec 3, 2020 •
edited
Loading

How to categorize this PR?

/area usability dev-productivity
/kind enhancement
/priority normal

What this PR does / why we need it:

With this PR the effective version is injected into the built binary, just like we do it in g/g (ref gardener/gardener#2500) and images built by make docker-image are tagged with the effective version (including the commit hash) just like in the pipeline.
Also, a make target docker-push was added.

All of this makes it easier to built and push development images for verification of new changes.

Additionally, grm has a --version option now and logs the binary version on startup:

$ docker run eu.gcr.io/gardener-project/gardener/gardener-resource-manager:v0.21.0-dev-ae4644d6785a17caa92dc2c99ef197f1ecea5fd9 --version
gardener-resource-manager version v0.21.0-dev-ae4644d6785a17caa92dc2c99ef197f1ecea5fd9

$ docker run eu.gcr.io/gardener-project/gardener/gardener-resource-manager:v0.21.0-dev-ae4644d6785a17caa92dc2c99ef197f1ecea5fd9
{"level":"info","ts":"2020-12-03T08:48:21.917Z","logger":"gardener-resource-manager.entrypoint","msg":"Starting gardener-resource-manager...","version":"v0.21.0-dev-ae4644d6785a17caa92dc2c99ef197f1ecea5fd9"}

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:

Docker images built by `make docker-images` are now tagged and build with the commit hash appended to the version.
gardener-resource-manager now logs its own version on startup or when executed with `--version`.

@ghost ghost added area/dev-productivity Developer productivity related (how to improve development) area/usability Usability related kind/enhancement Enhancement, improvement, extension priority/normal needs/review Needs review size/xl Size of pull request is huge (see gardener-robot robot/bots/size.py) needs/second-opinion Needs second review by someone else reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Dec 3, 2020
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Dec 3, 2020
@timebertt
Copy link
Copy Markdown
Contributor Author

timebertt commented Dec 3, 2020

Something is still broken here:

$ docker run eu.gcr.io/gardener-project/gardener/gardener-resource-manager:v0.21.0-dev-ae4644d6785a17caa92dc2c99ef197f1ecea5fd9 --version
gardener-resource-manager version v0.21.0-dev

Checking...

@timebertt timebertt mentioned this pull request Dec 3, 2020
Merged
@timebertt
Copy link
Copy Markdown
Contributor Author

timebertt commented Dec 3, 2020

Now it works:

$ docker run eu.gcr.io/gardener-project/gardener/gardener-resource-manager@sha256:3328ef598d0168c424f9b6ab40a32f872cc1bbb59926b6e01249a0d2c011aa70 --version
gardener-resource-manager version v0.21.0-dev-ae4644d6785a17caa92dc2c99ef197f1ecea5fd9

@gardener-robot-ci-2 gardener-robot-ci-2 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Dec 4, 2020
@ghost ghost added size/s Size of pull request is small (see gardener-robot robot/bots/size.py) and removed size/xl Size of pull request is huge (see gardener-robot robot/bots/size.py) labels Dec 4, 2020
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Dec 4, 2020
@timebertt
Copy link
Copy Markdown
Contributor Author

timebertt commented Dec 4, 2020

#95 is merged, rebased this one.
/ready

@ghost ghost marked this pull request as ready for review December 4, 2020 15:03
@ghost ghost self-requested a review as a code owner December 4, 2020 15:03
@gardener-robot-ci-2 gardener-robot-ci-2 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Dec 4, 2020
@timebertt timebertt mentioned this pull request Dec 4, 2020
Closed
rfranzke
rfranzke approved these changes Dec 7, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

/lgtm

@ghost ghost added reviewed/lgtm Has approval for merging and removed needs/review Needs review needs/second-opinion Needs second review by someone else labels Dec 7, 2020
@rfranzke rfranzke merged commit 0f0ec3d into gardener-attic:master Dec 7, 2020
@timebertt timebertt deleted the enh/version branch December 7, 2020 11:50
@ghost ghost added priority/3 Priority (lower number equals higher priority) and removed priority/3 Priority (lower number equals higher priority) labels Mar 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@rfranzke rfranzke rfranzke approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/dev-productivity Developer productivity related (how to improve development) area/usability Usability related kind/enhancement Enhancement, improvement, extension needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging size/s Size of pull request is small (see gardener-robot robot/bots/size.py)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@timebertt @rfranzke @gardener-robot-ci-1 @gardener-robot-ci-2