Commit Graph

2043 Commits (cc7999c00a40df21bd3b5e85ecea3b817377b231)

Author SHA1 Message Date
brendandburns cc7999c00a Merge pull request #1268 from dchen1107/termination
Proposed ContainerStatus for each individual Container in a Pod.
2014-09-11 16:17:59 -07:00
Dawn Chen 7b46d8c9c5 typo 2014-09-11 16:07:56 -07:00
brendandburns 445e3f9b4c Add a pointer to running on open stack docs. 2014-09-11 16:04:50 -07:00
Dawn Chen 6bbd040744 Merge pull request #1287 from brendandburns/logs
Start log rolling for docker containers too. Fix logrotate for other daemons.
2014-09-11 16:00:14 -07:00
Brendan Burns 76c0ce374d Start log rolling for docker containers too. Fix logrotate for other daemons. 2014-09-11 15:47:06 -07:00
bgrant0607 8922624ed0 Merge pull request #1286 from brendandburns/fix
Fix the e2e scripts after PR 1284 which added a new file.
2014-09-11 15:35:46 -07:00
Filipe Brandenburger fabf7c7f55 Fix the e2e scripts after PR 1284 which added a new file. 2014-09-11 15:32:11 -07:00
Dawn Chen 25fbe210f6 Clean up 2014-09-11 15:30:06 -07:00
Dawn Chen 3faf393e7b Introduce ContainerStates. Currently keep it has the same set as PodStatus:
Waiting, Running, Termination. For each state, there are some meaningful
status associated with it.
2014-09-11 15:22:53 -07:00
Filipe Brandenburger 9d88288ab5 Merge pull request #1265 from mbforbes/master
Fix some readme and script bugs in examples (take 2).
2014-09-11 15:07:55 -07:00
Max Forbes bd196ea49c Fix some readme and script bugs in examples (take 2).
v2: Resolve issues from comments, fix bugs in update-demo example, rename files for clarity, add turn-down steps.

v3: Add more set commands, clean up rest of env var checks.
2014-09-11 15:06:10 -07:00
Dawn Chen ee129cd440 Proposed ContainerStatus for each individual Container in a Pod. 2014-09-11 14:34:21 -07:00
Daniel Smith 57b721dd05 Merge pull request #1281 from bgrant0607/master
Misc. doc updates: Go setup, ssh reqd. on GCE, etcd reqd. for local, moved community links to wiki
2014-09-11 14:10:26 -07:00
Daniel Smith 6757b402d5 Merge pull request #1133 from jwforres/enable_cors
Add option to enable a simple CORS implementation for the api server
2014-09-11 13:59:14 -07:00
Jessica Forrester 0f2b8f4f9f Create passthroughLogger when LogOf is called and request has no logger 2014-09-11 16:48:06 -04:00
brendandburns 3f4a09175c Merge pull request #1279 from derekwaynecarr/ip_as_hostname_vagrant
No DNS in vagrant cross minions, need explicit IP as host
2014-09-11 13:38:58 -07:00
Brian Grant 276df0bf2a Misc. doc updates: Go setup, ssh reqd. on GCE, etcd reqd. for local, moved community links to wiki 2014-09-11 20:10:49 +00:00
derekwaynecarr 0c20fffa06 No DNS in vagrant cross minions, need explicit IP as host 2014-09-11 13:38:50 -04:00
Joe Beda 7de0989a4e Merge pull request #1270 from satnam6502/master
Improve the documentation for end-to-end tests.
2014-09-11 10:11:52 -07:00
Daniel Smith b5c6edcd79 Merge pull request #1189 from simon3z/ovirt-cloud
Add support for oVirt cloud provider
2014-09-11 09:50:31 -07:00
Federico Simoncelli 320fd528e2 Add support for oVirt cloud provider
This patch adds the initial support for the oVirt cloud provider.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2014-09-11 13:08:46 +00:00
Satnam Singh b16ac5dc0e Improve the documentation for end-to-end tests. 2014-09-10 21:29:44 -07:00
Clayton Coleman c378b7b022 Merge pull request #1262 from dchen1107/restart
Fix PodInfo to include last terminated container info when calling
2014-09-10 19:01:31 -04:00
Dawn Chen b48834e198 Fix PodInfo to include last terminated container info when calling
GetPodInfo based on name and UUID. With this fix, if some of containers
are dead, the pod status will stay as Running, not reset back to Waiting.
2014-09-10 14:41:18 -07:00
Filipe Brandenburger fc7f2f1058 Merge pull request #1267 from eparis/document-hack-config-variables
Try to document all environment variable used by config-go.sh
2014-09-10 14:27:11 -07:00
Eric Paris d687156154 Try to document all environment variable used by config-go.sh 2014-09-10 17:16:27 -04:00
Filipe Brandenburger 20c1349dba Merge pull request #1260 from eparis/config-gopath-overrides
Config gopath overrides
2014-09-10 13:58:28 -07:00
Eric Paris df5fe66636 KUBE_NO_GODEPS to not use in tree godeps
If this is set, and it normally shouldn't be, the config file will not
add the in tree Godeps to the GOPATH.  So all of them must be solved by
the KUBE_EXTRA_GOPATH
2014-09-10 16:51:23 -04:00
Eric Paris 35f03d4241 KUBE_EXTRA_GOPATH to append to the GOPATH
So you can add your own package to the GOPATH outside of the kube tree
2014-09-10 16:47:57 -04:00
Joe Beda a6e4d77faf Merge pull request #1263 from jbeda/master
Revert stuff Max pushed directly by accident.
2014-09-10 13:43:58 -07:00
Joe Beda 769d3ad882 Revert "Fix some readme and script bugs in examples."
This reverts commit 42baed492b.
2014-09-10 13:42:19 -07:00
Max Forbes 6a583ebcf5 Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes 2014-09-10 13:36:55 -07:00
Max Forbes 42baed492b Fix some readme and script bugs in examples. 2014-09-10 13:34:36 -07:00
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