github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/hack
History
Kubernetes Submit Queue 53e9832ba3 Merge pull request #31087 from gen0cide-/fix-etcd-version-check 
Automatic merge from submit-queue

Updating version check for etcd

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:

Currently, if you `make build`, etcd is not properly version checked because `etcd -version` does multi-line output. This output cannot be version compared. This small change fixes that.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
```
 		2016-08-22 05:36:47 -07:00
..
boilerplate Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
cmd/teststale Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
e2e-internal Move kubemark, skew, upgrade, leak logic into hack/e2e.go 2016-08-09 14:04:19 -07:00
gen-swagger-doc change the relative links to definition in operations.html to satisfy the new path set in the kubernetes.io 2016-07-29 13:29:34 -07:00
jenkins Merge pull request #30906 from wonderfly/version-map 2016-08-22 00:15:40 -07:00
lib Updating version check for etcd 2016-08-21 17:13:52 -07:00
make-rules Merge pull request #30893 from ivan4th/fix-caching-of-go-dirs 2016-08-22 00:54:33 -07:00
testdata Allow changes to container image for updates 2016-08-18 16:33:51 -07:00
verify-flags Merge pull request #30212 from feiskyer/kuberuntime-flag 2016-08-21 12:03:10 -07:00
.linted_packages Merge pull request #30638 from krousey/metrics_registration 2016-08-21 16:47:05 -07:00
OWNERS
…
autogenerated_placeholder.txt Revamp doc generation 2016-06-08 17:22:12 -07:00
benchmark-go.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
benchmark-integration.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
build-cross.sh Make releases work 2016-07-12 21:52:54 -07:00
build-go.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
build-ui.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
cherry_pick_pull.sh Add dry run capability to cherry_pick_pull.sh 2016-08-02 22:16:55 -04:00
dev-build-and-push.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
dev-build-and-up.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
dev-push-hyperkube.sh Handle spaces in some hack/ scripts. Cleanup after hyperkube build. 2016-08-15 21:13:13 +00:00
e2e-node-test.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
e2e.go Merge pull request #30575 from soltysh/scheduledjobs_e2e 2016-08-19 23:42:32 -07:00
federated-ginkgo-e2e.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
generate-docs.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
get-build.sh Merge pull request #26755 from david-mcmahon/fix-headers 2016-06-29 18:46:07 -07:00
ginkgo-e2e.sh Revert "Revert "Drop support for --gce-service-account, require activated creds"" 2016-08-02 20:34:02 -07:00
godep-save.sh added copy.sh which cuts the client repo; made necessary changes to scripts in 2016-08-09 14:07:53 -07:00
grab-profiles.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
install-etcd.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
list-feature-tests.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
local-up-cluster.sh enhancements to local-up-cluster.sh: 2016-08-02 14:12:14 -04:00
lookup_pull.py Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
run-in-gopath.sh Allow make to run from outside GOPATH 2016-07-15 08:42:12 -07:00
test-cmd.sh fix hack/test-cmd 2016-08-02 10:27:29 -04:00
test-go.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
test-integration.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
test-update-storage-objects.sh Add migration test 2016-08-18 08:31:33 +02:00
update-all.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-api-reference-docs.sh change the relative links to definition in operations.html to satisfy the new path set in the kubernetes.io 2016-07-29 13:29:34 -07:00
update-bindata.sh Add a verbosity concept to kubernetes scripts 2016-08-04 22:01:22 -07:00
update-codecgen.sh added copy.sh which cuts the client repo; made necessary changes to scripts in 2016-08-09 14:07:53 -07:00
update-codegen.sh Adding events to federation clientset and adding an e2e 2016-08-12 17:47:49 -07:00
update-federation-swagger-spec.sh Adding a script to fetch swagger spec from federation apiserver 2016-08-18 17:19:21 -07:00
update-generated-docs.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
update-generated-protobuf-dockerized.sh Fix subtle build breakage 2016-08-12 21:20:38 -07:00
update-generated-protobuf.sh Allow non-root build to write go code. 2016-07-03 00:39:59 -07:00
update-generated-runtime-dockerized.sh Make update-generated-runtime work 2016-07-12 21:52:54 -07:00
update-generated-runtime.sh Make update-generated-runtime work 2016-07-12 21:52:54 -07:00
update-generated-swagger-docs.sh interesting changes to add tokenreviews endpoint to implement webhook 2016-08-03 08:37:45 -04:00
update-godep-licenses.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-gofmt.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-munge-docs.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
update-swagger-spec.sh Adding a script to fetch swagger spec from federation apiserver 2016-08-18 17:19:21 -07:00
update_owners.py Remove myself from test ownership. 2016-08-03 14:34:31 -07:00
verify-all.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-api-reference-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-boilerplate.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-codecgen.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-codegen.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-description.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-flags-underscore.py Fix Makefile deps to rebuild less often 2016-07-12 21:52:54 -07:00
verify-generated-docs.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-generated-protobuf.sh Don't check in generated deep-copy code 2016-07-12 21:52:54 -07:00
verify-generated-runtime.sh Proposal for client-server container runtime 2016-07-12 09:17:08 +08:00
verify-generated-swagger-docs.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-godep-licenses.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-godeps.sh Make verify-godeps check the results 2016-08-02 09:06:14 -07:00
verify-gofmt.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-golint.sh Start verifying golint on a per-package basis as packages are fixed 2016-08-10 17:40:06 -07:00
verify-govet.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-import-boss.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-linkcheck.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-munge-docs.sh Add missing mungedoc run to hack/verify-munge-docs.sh. 2016-07-13 13:39:20 -07:00
verify-swagger-spec.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-symbols.sh Use make as the main build tool 2016-07-12 21:52:00 -07:00
verify-test-images.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00