Skip to content

Build: Allow downstream to tweak symbols#5796

Merged
istio-testing merged 1 commit intoistio:masterfrom
jwendell:ld-extra-flags
Jun 22, 2018
Merged

Build: Allow downstream to tweak symbols#5796
istio-testing merged 1 commit intoistio:masterfrom
jwendell:ld-extra-flags

Conversation

@jwendell
Copy link
Copy Markdown
Member

Currently we allow users who build istio to override some
version values, by providing their own "buildinfo" file with
values for the version variables. Those are linked properly
by the gobuild.sh script, that makes use of the -X ldflags
option for the go linker.

This PR makes this ability more general allowing users to
override any symbol they want, by providing their own "buildinfo"
file with one symbol (full path) per line, like for example:

istio.io/istio/pkg/version.buildVersion=0.8
istio.io/istio/pkg/version.buildStatus=Clean

This is especially useful for downstream distributors that
need to tweak (at build time) a hardcoded variable other
than those who control the version output.

@jwendell
Copy link
Copy Markdown
Member Author

cc @ldemailly @costinm

@ldemailly
Copy link
Copy Markdown
Member

/ok-to-test

@jwendell
Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@jwendell
Copy link
Copy Markdown
Member Author

/retest

@ldemailly
Copy link
Copy Markdown
Member

krisha/seb can you take a look ? lgtm if it works but i don't know how it may impact the current official releases

@sebastienvas
Copy link
Copy Markdown
Contributor

/lgtm
/hold
Feel free to unhold if the failures are expected.

@istio-testing istio-testing added do-not-merge/hold Block automatic merging of a PR. lgtm labels Jun 15, 2018
@sebastienvas
Copy link
Copy Markdown
Contributor

/hold cancel

@istio-testing istio-testing removed the do-not-merge/hold Block automatic merging of a PR. label Jun 15, 2018
@stale
Copy link
Copy Markdown

stale bot commented Jun 22, 2018

This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

@stale stale bot added the stale label Jun 22, 2018
@ldemailly
Copy link
Copy Markdown
Member

@jwendell can you resolve conflict and let's get this in

@stale stale bot removed the stale label Jun 22, 2018
Currently we allow users who build istio to override some
version values, by providing their own "buildinfo" file with
values for the version variables. Those are linked properly
by the gobuild.sh script, that makes use of the -X ldflags
option for the go linker.

This PR makes this ability more general allowing users to
override any symbol they want, by providing their own "buildinfo"
file with one symbol (full path) per line, like for example:

istio.io/istio/pkg/version.buildVersion=0.8
istio.io/istio/pkg/version.buildStatus=Clean

This is especially useful for downstream distributors that
need to tweak (at build time) a hardcoded variable other
than those who control the version output.
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 22, 2018

Codecov Report

Merging #5796 into master will increase coverage by 6%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #5796     +/-   ##
========================================
+ Coverage      68%     73%     +6%     
========================================
  Files         357     322     -35     
  Lines       31094   27846   -3248     
========================================
- Hits        21018   20287    -731     
+ Misses       9246    6758   -2488     
+ Partials      830     801     -29
Impacted Files Coverage Δ
mixer/pkg/adapter/quotas.go 0% <0%> (-100%) ⬇️
mixer/pkg/adapter/check.go 60% <0%> (-40%) ⬇️
mixer/adapter/rbac/controller.go 30% <0%> (-23%) ⬇️
pilot/pkg/model/authentication.go 57% <0%> (-15%) ⬇️
mixer/adapter/kubernetesenv/kubernetesenv.go 68% <0%> (-15%) ⬇️
mixer/adapter/solarwinds/log_handler.go 69% <0%> (-11%) ⬇️
mixer/adapter/kubernetesenv/cache.go 83% <0%> (-10%) ⬇️
galley/pkg/server/server.go 81% <0%> (-9%) ⬇️
...ilot/pkg/networking/plugin/authn/authentication.go 68% <0%> (-9%) ⬇️
mixer/adapter/stackdriver/stackdriver.go 48% <0%> (-8%) ⬇️
... and 208 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1d6c6c3...a2f122e. Read the comment docs.

@jwendell
Copy link
Copy Markdown
Member Author

@ldemailly done, thanks.

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jun 22, 2018

@jwendell: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
prow/istio-pilot-e2e.sh 2d98127cf30ca9e683f6e9823722cc1c7053e2c0 link /test istio-pilot-e2e
prow/istio-unit-tests.sh a2f122e link /test istio-unit-tests
prow/e2e-dashboard.sh a2f122e link /test e2e-dashboard
Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@ldemailly
Copy link
Copy Markdown
Member

/lgtm

@istio-testing
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jwendell, ldemailly, sebastienvas

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@istio-testing istio-testing merged commit 4e6aa1f into istio:master Jun 22, 2018
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.

5 participants