Commit Graph

2004 Commits (4f8536dd80f127aafdecb577e3e76ce4ca04bfd8)

Author SHA1 Message Date
brendandburns 4f8536dd80 Merge pull request #1211 from derekwaynecarr/kubecfg_improve_c_option
Add support to fetch config file from network
2014-09-10 13:06:03 -07:00
brendandburns 736d63e01b Merge pull request #1252 from pietern/vsphere-update-doc
Update vSphere getting started doc
2014-09-10 13:04:49 -07:00
brendandburns dedd92963f Merge pull request #1259 from thockin/build
Remove Godeps build artifacts on clean
2014-09-10 12:59:12 -07:00
Tim Hockin 57239e32e8 Remove Godeps build artifacts on clean 2014-09-10 12:06:46 -07:00
bgrant0607 fb4199cba7 Merge pull request #1238 from brendandburns/service
Add an earlier check and error for names that won't work for services.
2014-09-10 11:41:57 -07:00
Brendan Burns 80c06f4768 Add an earlier check and error for names that won't work for services. 2014-09-10 11:31:03 -07:00
brendandburns b8d9372b64 Add a pointer to the digital ocean instructions 2014-09-10 11:29:30 -07:00
Filipe Brandenburger 60d4770127 Merge pull request #1191 from eparis/targets-in-config
Move targets and packages from build-go to config-go
2014-09-10 10:31:28 -07:00
Eric Paris e426dd78a1 function to turn list of targets to list of go packages 2014-09-10 13:16:45 -04:00
Eric Paris 4ba97e3968 Move default target list from build_go to config_go 2014-09-10 12:20:50 -04:00
Pieter Noordhuis 63ac1dc213 Update vSphere getting started doc 2014-09-10 00:17:41 +00:00
Filipe Brandenburger 516de0550a Merge pull request #1221 from jbeda/dockerized-deploy
Fix up dockerized build and release build
2014-09-09 16:34:21 -07:00
Joe Beda 9ffe6c05dc Merge pull request #1251 from filbranden/version_string1
Use just GitVersion for the -version output
2014-09-09 16:32:01 -07:00
Daniel Smith 48913672d9 Merge pull request #1248 from brendandburns/replicas
Make replica controllers return current state.
2014-09-09 16:27:21 -07:00
brendandburns e9d12fef05 Merge pull request #1250 from dchen1107/cleanup
Small clean up in validation.
2014-09-09 16:24:12 -07:00
Brendan Burns e7625c8d91 Add current state to replica controller. 2014-09-09 16:19:18 -07:00
Filipe Brandenburger 8de322f196 Use just GitVersion for the -version output
It turns out that that's simply the most useful information about the version
that was built.

For a git tree, it includes information about the closest release, number of
commits since the release, enough of the SHA1 to find the exact commit and
whether the tree was clean or dirty at build time.

For a build from tarball, it will include information of which release was built
and, when using a tarball from a not released commit (e.g. downloading
"master.tar.gz" from GitHub, not recommended!) it will include the -dev prefix
to indicate that was not an official release. (That's as good as we can get with
it.)

If additional information is required, it can be found with -version=raw.

Tested:

- Built from the git tree:

    $ _output/go/bin/kubecfg -version
    Kubernetes v0.2-29-gd916051e9db865
    $ _output/go/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-29-gd916051e9db865", GitCommit:"d916051e9db8650899acb9415a4e285e3e3a1f87", GitTreeState:"clean"}

- Built it from a dirty git tree:

    $ { echo 'package version'; echo 'var X = 1'; } >pkg/version/sillyvar.go
    $ make
    $ _output/go/bin/kubecfg -version
    Kubernetes v0.2-29-gd916051e9db865-dirty
    $ _output/go/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-29-gd916051e9db865-dirty", GitCommit:"d916051e9db8650899acb9415a4e285e3e3a1f87", GitTreeState:"dirty"}

- Tag it v0.3 and build it:

    $ git tag -a v0.3 -m 'Release Kubernetes v0.3'
    $ make
    $ _output/go/bin/kubecfg -version
    Kubernetes v0.3
    $ _output/go/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"3", GitVersion:"v0.3", GitCommit:"d916051e9db8650899acb9415a4e285e3e3a1f87", GitTreeState:"clean"}

- Built it from a tarball:

    $ wget -O kubernetes.tgz https://api.github.com/repos/filbranden/kubernetes/tarball/version_string1
    $ tar xvf kubernetes.tgz
    $ cd filbranden-kubernetes-*/
    $ make
    $ _output/go/bin/kubecfg -version
    Kubernetes v0.2-dev
    $ _output/go/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-dev", GitCommit:"", GitTreeState:"not a git tree"}

- Built it with `go get`:

    # I need to prefetch the tree to replace the official tree with mine:
    $ mkdir -p ${TMPDIR}/gopath/src/github.com/
    $ ln -sf filbranden ${TMPDIR}/gopath/src/github.com/GoogleCloudPlatform

    # Now run `go get` to build kubecfg:
    $ GOPATH=${TMPDIR}/gopath go get github.com/filbranden/kubernetes/cmd/kubecfg

    # Check the version:
    $ ${TMPDIR}/gopath/bin/kubecfg -version
    Kubernetes v0.2-dev
    $ ${TMPDIR}/gopath/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-dev", GitCommit:"", GitTreeState:"not a git tree"}

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-09 16:19:14 -07:00
Dawn Chen 80fa392f6b Small clean up in validation. errs is used as import path alias in validation.go, but it is reused
as a variable for validateVolume.
2014-09-09 16:08:21 -07:00
Joe Beda ed5bfa2f0f Match shell style guide.
Looking at https://google-styleguide.googlecode.com/svn/trunk/shell.xml
2014-09-09 16:04:41 -07:00
Joe Beda 70b026bd8d Merge pull request #1247 from filbranden/version_dev
Update version to use -dev suffix
2014-09-09 15:57:22 -07:00
Joe Beda 0333b97c56 Merge pull request #1245 from filbranden/server_version1
Uniformize handling of -server_version flag of kubecfg to match -version
2014-09-09 15:47:33 -07:00
Filipe Brandenburger 61877f2dd0 Update version to use -dev suffix
According to the plan listed in docs/releasing.md.

The gitMinor will keep using a "+" suffix instead for now.

Added a //TODO to deprecate gitMajor and gitMinor in a follow up.

Tested:
- Built it from the git tree:

    $ make
    $ _output/go/bin/kubecfg -version
    Kubernetes version 0.2+, build 8d31eb03c11d4db64ae26809eef7f73070efd811
    $ _output/go/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-29-g8d31eb03c11d4d", GitCommit:"8d31eb03c11d4db64ae26809eef7f73070efd811", GitTreeState:"clean"}

- Built it with a direct `go install` (same as tarball):

    $ GOPATH=${PWD}/_output/go:${PWD}/Godeps/_workspace go install $KUBE_GO_PACKAGE/cmd/kubecfg
    $ _output/go/bin/kubecfg -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-dev", GitCommit:"", GitTreeState:"not a git tree"}
    $ _output/go/bin/kubecfg -version
    Kubernetes version 0.2+, build (unknown)

A follow up commit will address the output of the -version (without "raw") command to use gitVersion instead of Major + Minor.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-09 15:46:20 -07:00
Filipe Brandenburger b849d65b32 Uniformize handling of -server_version flag of kubecfg to match -version.
In particular, add support for -server_version=raw and use matching
format for the output of -version and -server_version.

The "normal" format is essentially defined by (version.Info) String()
method, so future updates to that method will be reflected on both.

Full version information is still available by using the "raw" flag.

Tested:
- Used cluster/kubecfg.sh to query local build and the server.

    $ cluster/kubecfg.sh -version
    Kubernetes version 0.2+, build 9316edfc0d2b28923fbb6eafa38458350859f926
    $ cluster/kubecfg.sh -server_version
    Server: Kubernetes version 0.2, build a0abb38157
    $ cluster/kubecfg.sh -version=raw
    version.Info{Major:"0", Minor:"2+", GitVersion:"v0.2-25-g9316edfc0d2b28", GitCommit:"9316edfc0d2b28923fbb6eafa38458350859f926", GitTreeState:"clean"}
    $ cluster/kubecfg.sh -server_version=raw
    version.Info{Major:"0", Minor:"2", GitVersion:"v0.2", GitCommit:"a0abb3815755d6a77eed2d07bb0aa7d255e4e769", GitTreeState:"clean"}

Fixes: #1092

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-09 15:25:41 -07:00
Brendan Burns 4ba4762827 Insert the current state of a replica controller. 2014-09-09 15:23:34 -07:00
Joe Beda ffcfdd0e2d Merge pull request #1237 from filbranden/release_docs
Document Kubernetes Release Process
2014-09-09 15:22:16 -07:00
derekwaynecarr 35a50a94da Add support to fetch config file from network 2014-09-09 17:50:38 -04:00
Tim Hockin 4ff76add57 Merge pull request #1147 from dchen1107/restart
Introduce the simplest RestartPolicy and handling.
2014-09-09 14:44:42 -07:00
Daniel Smith a4e3a4e351 Merge pull request #1240 from brendandburns/http
Don't stack trace on 301s
2014-09-09 14:16:59 -07:00
brendandburns 5bb9495258 Merge pull request #1242 from lavalamp/fix
go test -cover -race is fixed now
2014-09-09 14:14:15 -07:00
Brendan Burns 69b359b689 Don't stack trace on 301s 2014-09-09 14:10:46 -07:00
Daniel Smith d397d64b9e go test -cover -race is fixed now 2014-09-09 14:06:23 -07:00
Filipe Brandenburger ec2a39e08e Document Kubernetes Release Process
This documentation covers the proposed release process that will improve
support for versioning builds from tarball.

There's also a diagram to explain how versioning works in face of other
commits being merged in parallel and the quirks of intermediate versions
close to the release window.

Addresses Issue #1226.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-09 14:02:50 -07:00
Joe Beda c5cb7202af Add support for versions in dockerized build. 2014-09-09 14:00:30 -07:00
Joe Beda 7fc3a6c050 Added scheduler binaries plus other misc fixes
* Support cleaning out built docker images
* Use bash arrays in places
* Lock etcd version we are testing against
2014-09-09 13:59:23 -07:00
Joe Beda ec8ede9354 Refactor GCS parts of new release process 2014-09-09 13:53:40 -07:00
Joe Beda 732b7ce7ef Merge pull request #1234 from brendandburns/fix
Add initial logrotate support.
2014-09-09 13:50:06 -07:00
Brendan Burns 686c3bec84 Add initial logrotate support. 2014-09-09 13:35:06 -07:00
Daniel Smith 1fd12778eb Merge pull request #1231 from brendandburns/service
Fix a bug where we don't return an error.
2014-09-09 12:48:19 -07:00
brendandburns a32cb68977 Merge pull request #1232 from dbcode/master
avoid dumping error pages into error messages
2014-09-09 12:43:19 -07:00
Clayton Coleman 055c9d5ad2 Merge pull request #1215 from rajatchopra/ovsdoc
ovs networking document
2014-09-09 14:51:12 -04:00
Brendan Burns a343a93b2d Fix a bug where we don't return an error. 2014-09-09 10:29:00 -07:00
Dave Bailey 5ec748dc5e avoid dumping error pages into error messages 2014-09-09 17:20:58 +00:00
Daniel Smith c61bc58683 Merge pull request #1115 from csrwng/use_codec_in_printing_and_parsing
Use codec to encode/decode api objects in client and kubecfg parser
2014-09-09 09:58:30 -07:00
csrwng 6551f4e0f0 Use codec to encode/decode api objects in client and kubecfg parser 2014-09-09 08:45:53 -04:00
Dawn Chen 15cab4d053 Introduce the simplest RestartPolicy and handling. 2014-09-08 22:41:38 -07:00
brendandburns d7f84aef82 refine links. 2014-09-08 21:14:09 -07:00
brendandburns 84edb60bcd slight wording change 2014-09-08 21:12:56 -07:00
brendandburns 56c8f43f0c update vagrant to point at the 0.2 release 2014-09-08 21:12:36 -07:00
brendandburns 9ad7618a73 Change directions to use a "stable" release. 2014-09-08 21:09:52 -07:00
brendandburns b4e08dd347 Merge pull request #1219 from filbranden/release_v0.2
Release Kubernetes v0.2
2014-09-08 21:04:34 -07:00