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.

Sign up for GitHub

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

Jump to bottom

Fixes incorrect logic in determining ImageVersion from LDFlags variable #84

Closed
wants to merge 2 commits into from
Closed

Fixes incorrect logic in determining ImageVersion from LDFlags variable #84

wants to merge 2 commits into from

Conversation

phantomjinx
Copy link
Member

No description provided.

@phantomjinx
fix: Adds support for LDflags in Dockerfile for testing hawtio#83
cb63d43 
* Dockerfile / Makefile
  * Provides support for adding LDflags for IMAGE_VERSION and
    IMAGE_REPOSITORY to go build command
  * Default added for args in case Dockerfile is used to be built without
    specifying args

* setup/kustomization.yaml
  * Removes incorrect name of CRD - deferring to the directory's kustomize
    file
@phantomjinx
fix: Corrects the logic of determining the version hawtio#83
72652f4 
* main.go
  * Adds missing ImageVersion to the BuildVariables that then get
    re-assigned to the operator's utils BuildVariables

* deployment.go
  * Corrects the logic of determining the ImageVersion from
      1. IMAGE_VERSION env var
      2. BuildVariables.ImageVersion
      3. Default to 'latest'
@phantomjinx phantomjinx requested a review from mmelko November 27, 2023 20:34
@phantomjinx phantomjinx self-assigned this Nov 27, 2023
@phantomjinx phantomjinx requested a review from tadayosi November 27, 2023 20:35
@phantomjinx phantomjinx added the go Pull requests that update Go code label Nov 27, 2023
tadayosi
tadayosi requested changes Nov 28, 2023
View reviewed changes
Copy link
Member

@tadayosi tadayosi left a comment

Choose a reason for hiding this comment

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

You should merge it into main branch, not 1.x. The same applies to other changes you've made so far.

@tadayosi
Copy link
Member

Please don't use 1.x until we want to start 2.0 development.

tadayosi
tadayosi reviewed Nov 28, 2023
View reviewed changes
Dockerfile Show resolved Hide resolved
@phantomjinx
Copy link
Member Author

You should merge it into main branch, not 1.x. The same applies to other changes you've made so far.

Yes, an error, thx.

Just FYI, the 1.x branch is being used to do the downstream build so once the changes are in main, they are being rebased over to it.

@phantomjinx
Copy link
Member Author

phantomjinx commented Nov 28, 2023 •
edited
Loading

Incorrect branch being merged to.

New PRs at:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tadayosi tadayosi tadayosi requested changes

@mmelko mmelko Awaiting requested review from mmelko

Assignees

@phantomjinx phantomjinx

Labels
go Pull requests that update Go code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phantomjinx @tadayosi