Commit Graph

1875 Commits (45aaff999392a1b861b075c724115ed2ba4c7de3)

Author SHA1 Message Date
Joe Beda 45aaff9993 Add template update to rollingUpdate 2014-09-04 13:25:38 -07:00
Joe Beda 2444e4e1dc Simplify labels for `kubecfg run`
We created a name=<controller name> label on each object we created.  This was confusing.  Instead, piggyback on `replicationController` label and use that as the selector.
2014-09-04 13:25:38 -07:00
brendandburns 8bfba149a5 Merge pull request #1171 from yaronr/patch-1
Update azure.md
2014-09-04 13:03:31 -07:00
brendandburns 306edbb7c2 Merge pull request #1180 from brendandburns/fix
Move vendored etcd to third_party/...
2014-09-04 12:07:50 -07:00
Brendan Burns 4a934427db Exclude vendored etcd. 2014-09-04 12:05:34 -07:00
Dawn Chen 87278a6f56 Merge pull request #1179 from brendandburns/fix
Fix travis and cluster installs.
2014-09-04 10:32:45 -07:00
Brendan Burns 3864cf453a Fix travis and cluster installs. 2014-09-04 10:31:09 -07:00
Dawn Chen 569f61e072 Merge pull request #1177 from brendandburns/travis
Fix a shell typo.
2014-09-04 10:09:58 -07:00
Brendan Burns 78df593c57 Fix a shell typo. 2014-09-04 10:03:49 -07:00
Tim Hockin 512b0ab90a Merge pull request #1176 from brendandburns/travis
Re-enable travis for Go tip
2014-09-04 09:57:14 -07:00
Brendan Burns 53e3bff464 Re-enable travis for Go tip 2014-09-04 09:56:28 -07:00
Yaron Rosenbaum e7f7ac790d Update azure.md
For this to run, VNET and SUBNET need to be set.
2014-09-04 14:36:01 +03:00
Daniel Smith 779de7361a Merge pull request #1138 from bcwaldon/common-watch-code
Use shared watch code in kubelet etcd config
2014-09-03 23:47:09 -07:00
Tim Hockin 2e35834e9a Merge pull request #1163 from ghodss/exclude_godeps_from_git_hook
Adding files to Godeps should not trigger gofmt or boilerplate warnings
2014-09-03 22:42:44 -07:00
Tim Hockin a70749a4a5 Merge pull request #1145 from ddysher/pod-print-status
Include pod status in kebecfg humanreadable result.
2014-09-03 21:51:46 -07:00
Deyuan Deng 75470e6adf Include pod status in kebecfg humanreadable result. 2014-09-03 20:26:32 -04:00
Sam Ghods 98c3a00233 Adding files to Godeps should not trigger gofmt or boilerplate warnings 2014-09-03 17:00:30 -07:00
Brian Waldon 85bf7064bb Use shared watch code in kubelet etcd config 2014-09-03 15:51:02 -07:00
Daniel Smith 51a86f839c Merge pull request #1158 from smarterclayton/separate_errors
Errors should be part of api/errors, not apiserver
2014-09-03 15:46:29 -07:00
Tim Hockin bf2170641b Merge pull request #1159 from filbranden/hack_test_goflags1
In hack/test-go.sh, treat arguments that start with a dash as go flags.
2014-09-03 15:34:38 -07:00
Filipe Brandenburger 3d03b4b80f Also assume arguments starting with dashes are go flags in `hack/build-go.sh`
Tested:
  $ hack/build-go.sh cmd/kubelet -v
  github.com/GoogleCloudPlatform/kubernetes/pkg/...

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-03 14:59:29 -07:00
Filipe Brandenburger 8effbdc63f In `hack/test-go.sh` treat arguments that start with a dash as go flags.
This fixes `hack/test-go.sh pkg/apiserver -test.run=<a_specific_test_name>`
which was broken by PR #1116.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-03 14:57:19 -07:00
brendandburns 2df3ff51f4 Merge pull request #1154 from jbeda/salt-reactor
Fix docker start after minion reboot on GCE/debian
2014-09-03 14:55:10 -07:00
brendandburns 8a603c1b0e Merge pull request #1157 from cjcullen/typo
Fixed some typos:
2014-09-03 14:54:24 -07:00
Clayton Coleman 34c40e4e48 Errors should be part of api/errors, not apiserver
Renames constructor methods to be errors.New<name> which changed a few
places.
2014-09-03 17:16:00 -04:00
Clayton Coleman 6dd4831de8 Move validation errors into their own file 2014-09-03 17:14:03 -04:00
CJ Cullen 4a2c3c8c87 Fixed some typos:
Changed "an unified" to "a unified"
Changed "a extra" to "an extra"
Changed "for each pod have" to "for each pod to have"
2014-09-03 14:03:33 -07:00
Daniel Smith 0db7989809 Merge pull request #1103 from smarterclayton/get_then_watch
Services and Endpoints aren't syncing properly
2014-09-03 13:16:41 -07:00
Clayton Coleman 01e668187c Services and Endpoints weren't properly sync'ing
They need incremental changes and a resync on start.
2014-09-03 16:04:55 -04:00
Filipe Brandenburger 6c5568261e Merge pull request #1116 from thockin/build_cleanups
Improve test script
2014-09-03 11:54:45 -07:00
Joe Beda 847c87faa8 Fix docker start after minion reboot on GCE/debian
Uncomment docker service state as it should no longer be affected by race bug in docker init.d start script.  Also make sure that the docker service state depends on the cbr state.

Fixes #802
2014-09-03 11:11:28 -07:00
Tim Hockin 640a1d323d Improve test script
add usage
verify flag value for -i is numeric
allow multiple targets on the command line
actually capture coverage output
fix lingering GOFLAGS undef issue
fix issue with -i not working at all: ((x++)) returns 1 when x is 0, which is
  incompatible with "set -e"
2014-09-03 09:40:20 -07:00
Clayton Coleman 42eea82461 Merge pull request #1137 from derekwaynecarr/name_vs_id_fixup
Fixup name vs ID terminology
2014-09-03 10:55:04 -04:00
derekwaynecarr ca3f5a9f46 Fixup name vs ID terminology 2014-09-03 10:27:33 -04:00
Joe Beda cbedf9f470 Merge pull request #1120 from doublerr/rackspace/fix_salt_apiserver
Rackspace: fix apiserver salt config
2014-09-02 21:31:05 -07:00
brendandburns 130bd408f7 Merge pull request #1124 from soundTricker/master
Fix a wrong explaining text about running command to create replication controllers.
2014-09-02 21:07:06 -07:00
Joe Beda 1210018b6e Merge pull request #1122 from filbranden/version_major_minor1
Push major and minor versions from git
2014-09-02 21:01:42 -07:00
Ryan Richard 58b9b2fb88 switch kubelets to connect to etcd on cloud network
Previously we were connecting across the public interfaces. This will connect across eth2 and send communication over a private network.
2014-09-02 19:05:57 -05:00
Ryan Richard 0fed66a667 add sanity checking steps and fix KUBE_MASTER_IP 2014-09-02 19:05:56 -05:00
Ryan Richard 0b50244c72 workaround lack of jinja2.7 support 2014-09-02 19:05:56 -05:00
Filipe Brandenburger b94749ec70 Set gitMajor and gitMinor from hack/build-go.sh
Set the values of major and minor version based on the output of the
`git describe` command, which uses annotated tags as source of
versioning information.

Minor will get a "+" appended whenever the annotated tag does not match
the tree exactly (including when the tree is dirty.) So that only
official releases will have a "bare" minor version, all others will have
a "+" to indicate the binaries contain changes from the released version
in minor.

(This is similar to how versions of development builds of the Linux
kernel work.)

Tested:
- With no annotated tags:
  $ hack/build-go.sh
  $ _output/go/bin/kubecfg -version=raw
  version.Info{Major:"0", Minor:"1+", GitVersion:"v0.1+", GitCommit:"7d29873bdee87efacaace30ab3602297cacf1b4f", GitTreeState:"clean"}

- Tagging current version on a clean git tree:
  $ git tag -a -m 'Test tag v2.3' v2.3
  $ hack/build-go.sh
  $ _output/go/bin/kubecfg -version=raw
  version.Info{Major:"2", Minor:"3", GitVersion:"v2.3", GitCommit:"7d29873bdee87efacaace30ab3602297cacf1b4f", GitTreeState:"clean"}

- Tagging current version on a dirty git tree:
  $ git tag -a -m 'Test tag v2.3' v2.3
  $ touch test.txt  # this is enough to mark the tree as dirty
  $ hack/build-go.sh
  $ _output/go/bin/kubecfg -version=raw
  version.Info{Major:"2", Minor:"3+", GitVersion:"v2.3-dirty", GitCommit:"7d29873bdee87efacaace30ab3602297cacf1b4f", GitTreeState:"dirty"}

- Tagging a previous version on a clean tree:
  $ git tag -a -m 'Test tag v2.3' v2.3 HEAD~5
  $ hack/build-go.sh
  $ _output/go/bin/kubecfg -version=raw
  version.Info{Major:"2", Minor:"3+", GitVersion:"v2.3-6-g7d29873bdee87e", GitCommit:"7d29873bdee87efacaace30ab3602297cacf1b4f", GitTreeState:"clean"}

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-02 16:23:31 -07:00
Filipe Brandenburger 8cd7387cc0 Include `-dirty` suffix in version info when building on a dirty tree
Ensure the output of `git describe` will include the `-dirty` suffix
when building on a tree with modified files in it.

Tested:
- ...

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-09-02 16:23:31 -07:00
Daniel Smith 0b4581e98d Merge pull request #1112 from filbranden/vagrant_salt_master2
Redirect output of `systemctl enable` to stdout
2014-09-02 16:20:52 -07:00
Tim Hockin d68a0ec383 Merge pull request #1041 from brendandburns/api
Add types for lifecycle events.
2014-09-02 15:20:45 -07:00
Brendan Burns dd9ecf5b79 Add types for lifecycle events. 2014-09-02 15:14:13 -07:00
brendandburns 25fdade6fa Merge pull request #1134 from thockin/race
try to fix data race
2014-09-02 14:07:15 -07:00
Daniel Smith d20264351b Merge pull request #1077 from brendandburns/service
Step #1 in migrating the service controller away from the apiserver.
2014-09-02 14:03:52 -07:00
Tim Hockin 8ad98db773 Merge pull request #1121 from filbranden/rawversion2
Add support for -version=raw
2014-09-02 13:53:13 -07:00
Tim Hockin 6a624a2b4f try to fix data race 2014-09-02 13:51:15 -07:00
Tim Hockin 0b67934123 Merge pull request #1140 from GoogleCloudPlatform/revert-1126-master
Revert "Fixed annoying typo"
2014-09-02 13:18:30 -07:00