Version cni plugin, ipamD, cni docker image with git tag and hash#106
Merged
mattlandis merged 1 commit intoaws:masterfrom Jul 5, 2018
ewbankkit:issue-90
Merged
Version cni plugin, ipamD, cni docker image with git tag and hash#106mattlandis merged 1 commit intoaws:masterfrom ewbankkit:issue-90
mattlandis merged 1 commit intoaws:masterfrom
ewbankkit:issue-90
Conversation
Contributor
Author
|
This PR replaces #103. |
Contributor
Author
$ make
go build -o aws-k8s-agent -ldflags "-X main.version=v1.0.0-9-gcb6547f" main.go
go build -o aws-cni -ldflags "-X main.version=v1.0.0-9-gcb6547f" plugins/routed-eni/cni.go
2018-06-12T16:10:00Z [INFO] Starting L-IPAMD v1.0.0-9-gcb6547f ...
2018-06-12T16:10:52Z [INFO] Starting CNI Plugin v1.0.0-9-gcb6547f ...
$ VERSION=42 make
go build -o aws-k8s-agent -ldflags "-X main.version=42" main.go |
Contributor
|
@ewbankkit could you please resolve the conflicts and update the pull request? |
Contributor
|
@mattlandis Could you please take another look at this one? |
Contributor
Author
|
Rebased to resolve conflict. $ make
GOOS=linux CGO_ENABLED=0 go build -o aws-k8s-agent -ldflags "-X main.version=v1.0.0-18-gcdbd144-dirty"
GOOS=linux CGO_ENABLED=0 go build -o aws-cni -ldflags "-X main.version=v1.0.0-18-gcdbd144-dirty" ./plugins/routed-eni/
2018-07-03T20:31:55Z [INFO] Starting L-IPAMD v1.0.0-18-gcdbd144-dirty ...
$ VERSION=42 make
GOOS=linux CGO_ENABLED=0 go build -o aws-k8s-agent -ldflags "-X main.version=42"
GOOS=linux CGO_ENABLED=0 go build -o aws-cni -ldflags "-X main.version=42" ./plugins/routed-eni/
2018-07-03T20:40:23Z [INFO] Starting L-IPAMD 42 ... |
Contributor
|
Looks good. Thanks for the contribution. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue #, if available: Fixes #90.
Description of changes:
Use the git tag and hash of the current commit as the version number for IPAMD, CNI Plugin and Docker image.
The calculated version number can be overridden via the
VERSIONenvironment variable.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.