github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,550 Commits
31 Branches
881 Tags
634 MiB
Commit Graph

6 Commits (b5b68488092c04a6f7c3069a8f2d826832f84441)

Author SHA1 Message Date
Yuki Yugui Sonoda 331fd0d986 Extract "pkg/version".PrintAndExitIfRequested() to its own package 
because it causes a runtime panic if a binary which has its own implementation
of "-version" flag tries to reuse a package library which indirectly depend on
"pkg/version".

e.g. If such an user-defined binary tires to link "pkg/api" or "pkg/client",
the binary fails with a runtime panic "flag redefined: version".
 2014-08-01 15:05:27 +09:00
Filipe Brandenburger de405ac126 Improve generation of version information from the git tree 
Detect whether the tree is dirty and append a "-dirty" indication to the
git commit (common practice with other repos, e.g. kernel, docker.)

Properly handle the case where a git tree is not found (e.g. building
from archive.)

In the sed expression, look for the variable to be updated
(commitFromGit) instead of hardcoding a line number.

Tested:

- Built from a dirty tree:
    $ output/go/bin/kubelet -version
    Kubernetes version 0.1, build 2d784c684c75-dirty

- Built from a clean tree:
    $ output/go/bin/kubelet -version
    Kubernetes version 0.1, build 505f23a31172

- Built from an archive:
    $ hack/build-go.sh
    WARNING: unable to find git commit, falling back to commitFromGit = `(none)`
    $ output/go/bin/kubelet -version
    Kubernetes version 0.1, build (none)

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
 2014-07-30 18:48:57 -07:00
Filipe Brandenburger 7e56609139 Handle -version flag on all commands 
Tested: Passed -version argument to kubelet (and all other binaries):
  $ output/go/bin/kubecfg -version
  Kubernetes version 0.1, build 6454a541fd56

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
 2014-07-30 18:48:56 -07:00
Daniel Smith 3b8488028d Add /version to server and check it in client. 
Will help detect client/version skew and prevent e2e test from passing
while running a version other than the one you think it's running.
 2014-07-28 15:45:25 -07:00
Daniel Smith 60f05c8d8d update version package when building. 2014-07-02 15:32:30 -07:00
Daniel Smith 68bef4ac0c add version package 2014-07-02 15:26:13 -07:00