Commit graph

9576 commits

Author SHA1 Message Date
Pierre Souchay 2ed7fddb06 Revendor memberlist to Fix #3217
Upgrade leads to protocol version (2) is incompatible: [1, 0] (#5313)

This is fixed in https://github.com/hashicorp/memberlist/pull/178, bump
memberlist to fix possible split brain in Consul.
2019-02-05 10:20:14 -05:00
R.B. Boyer eccc33c50a
cli: fix typo in help text for 'consul acl role read' (#5311) 2019-02-04 15:16:15 -06:00
Matt Keeler d386231516
Update CHANGELOG.md 2019-02-04 09:39:47 -05:00
Matt Keeler 210c3a56b0
Improve Connect with Prepared Queries (#5291)
Given a query like:

```
{
   "Name": "tagged-connect-query",
   "Service": {
      "Service": "foo",
      "Tags": ["tag"],
      "Connect": true
   }
}
```

And a Consul configuration like:

```
{
   "services": [
      "name": "foo",
      "port": 8080,
      "connect": { "sidecar_service": {} },
      "tags": ["tag"]
   ]
}
```

If you executed the query it would always turn up with 0 results. This was because the sidecar service was being created without any tags. You could instead make your config look like:

```
{
   "services": [
      "name": "foo",
      "port": 8080,
      "connect": { "sidecar_service": {
         "tags": ["tag"]
      } },
      "tags": ["tag"]
   ]
}
```

However that is a bit redundant for most cases. This PR ensures that the tags and service meta of the parent service get copied to the sidecar service. If there are any tags or service meta set in the sidecar service definition then this copying does not take place. After the changes, the query will now return the expected results.

A second change was made to prepared queries in this PR which is to allow filtering on ServiceMeta just like we allow for filtering on NodeMeta.
2019-02-04 09:36:51 -05:00
kaitlincarter-hc c4e4aad95b
Apply suggestions from code review
Co-Authored-By: adilyse <rebecca@hashicorp.com>
2019-02-01 14:33:06 -08:00
kaitlincarter-hc e845d4ad5f
Update website/source/docs/platform/k8s/service-sync.html.md
Co-Authored-By: adilyse <rebecca@hashicorp.com>
2019-02-01 14:32:37 -08:00
Jack Pearkes 00286b8122
Remove consul-docs automatic PR review (#5306)
We no longer want this single codeowner rule, though we are keeping this group.
2019-02-01 10:48:52 -08:00
Alvin Huang 027e31645d
Merge pull request #5284 from hashicorp/nomad_int_tests
add nomad int test
2019-02-01 11:44:11 -05:00
R.B. Boyer b5d71ea779
testutil: redirect some test agent logs to testing.T.Logf (#5304)
When tests fail, only the logs for the failing run are dumped to the
console which helps in diagnosis. This is easily added to other test
scenarios as they come up.
2019-02-01 09:21:54 -06:00
R.B. Boyer df546ad924
incorrect examples for 'consul acl policy' commands (#5303) 2019-02-01 09:16:36 -06:00
Rebecca Zanzig 0ec987d94f Update k8s ACL documentation
Clarifies that an ACL token only needs to be provided when ACLs are
enabled within the Consul cluster.
2019-01-31 13:55:09 -08:00
Matt Keeler 472b7165fd Fix some docs formatting around DNS SOA RR configuration (#5297) 2019-01-30 16:47:32 -06:00
Kyle Havlovitz 5a36c4e014
Update changelog with a missing note for 1.2.3 2019-01-30 10:47:21 -08:00
John Cowen 8483f0c27c
ui: Custom version of ember-block-slots compatible with ember 3 (#5245)
The original version of ember-block-slots doesn't support ember 3 and it
seems like development has stalled on the original version.

This adds a modified version as an in-repo-addon that is compatible with
ember 3.
2019-01-30 10:56:04 +00:00
Rebecca Zanzig a3fff4effe
Merge pull request #5292 from hashicorp/docs/acl-quotes
Switch smart quotes to straight quotes
2019-01-29 15:11:00 -08:00
R.B. Boyer 3396f4e987 update changelog 2019-01-29 15:55:58 -06:00
R.B. Boyer c11c0ea924
Merge pull request #5237 from hashicorp/term-grpc-stream-on-token-failure
Check ACLs more often for xDS endpoints.
2019-01-29 14:52:26 -06:00
kaitlincarter-hc 7b62d7192b
Created a new index page that links to all the ACL guides. I also removed the sidebar nav drop down to be more consistent with the other guides. (#5260) 2019-01-29 14:51:41 -06:00
R.B. Boyer 6071024121
build: fix 'make ui' scripts so that it can handle versions like "v1.4.0-rc1-55-g2c8675565-rc1 (2c8675565)" (#4920) 2019-01-29 14:24:26 -06:00
Rebecca Zanzig e159f3baeb Switch smart quotes to straight quotes
The ACL guide had a couple instances of smart quotes which get rendered
as the incorrect character on the website.
2019-01-29 11:29:16 -08:00
Alvin Huang 034fcd089f add nomad int test 2019-01-28 18:22:00 -05:00
mkeeler a26002000c Merge branch 'master' of https://github.com/hashicorp/consul 2019-01-28 22:26:18 +00:00
Ilya Pavlov 9cb766a8de Fix missed letter in the documentation (#5281) 2019-01-28 16:25:56 -06:00
mkeeler 53fc6ac2ed Merge branch 'master' of https://github.com/hashicorp/consul 2019-01-28 22:25:26 +00:00
mkeeler be909bbd13 Putting source back into Dev Mode 2019-01-28 22:25:12 +00:00
kaitlincarter-hc ffab5f55a6
Fixing broken link. (#5283) 2019-01-28 16:23:29 -06:00
mkeeler d6fed22022
Release v1.4.2 2019-01-28 21:46:00 +00:00
Kyle Havlovitz 11ba525556
Merge pull request #5282 from hashicorp/agent-test-fix
Fix failing TestAgent_PurgeCheckOnDuplicate after merge
2019-01-28 13:43:02 -08:00
Matt Keeler ae13b8cfd0
Fix typo in Changelog 2019-01-28 16:22:47 -05:00
Kyle Havlovitz 3934df9472
Fix failing TestAgent_PurgeCheckOnDuplicate after merge 2019-01-28 13:19:38 -08:00
Matt Keeler 41d8f12ac2
Update CHANGELOG.md 2019-01-28 15:03:13 -05:00
Matt Keeler e5cadc561a
Don't generate TXT records just to discard them (#5272)
* Don't generate TXT records just to discard them

* Add unit test for formatNodeRecord to ensure it prevents returning TXT records
2019-01-28 14:59:58 -05:00
Matt Keeler 6f17e05ba4
Build/auto bump website version (#5280)
Also of note is that for enterprise builds we can set CONSUL_NO_WEBSITE_UPDATE to prevent updating the version twice.

Lastly we also do not update the website version for pre-releases like rc1.

This just streamlines a release build a bit.
2019-01-28 14:51:49 -05:00
Kyle Havlovitz b72a4aa464
Merge branch 'healthcheck-duration-fix' 2019-01-28 10:34:34 -08:00
John Cowen c7e0810372
ui: Bump footer date (#5279) 2019-01-28 17:50:37 +00:00
Matt Keeler 470f6969de
Fall back to using old fields when marshaling
Co-Authored-By: kyhavlov <kylehav@gmail.com>
2019-01-28 08:47:26 -08:00
Gabriel Pérez S 945f4f355e Invalid syntax in Envoy configuration docs. (#5275) 2019-01-28 09:58:29 -05:00
Kyle Havlovitz 8544ee9d71
Re-add ReadableDuration types to health check definition
This is to fix the backwards-incompatible change made in 1.4.1 by
changing these fields to time.Duration.
2019-01-25 14:47:35 -08:00
Jack Pearkes b7a1a9fcf3
Update CHANGELOG.md 2019-01-25 13:31:28 -08:00
danielehc ac288bad21 Adding quorum note on leave command page (#5102)
Reusing the same phrasing as  https://github.com/hashicorp/consul/pull/5095/ to provide info on the effects of the `consul leave` command on Consul quorum
2019-01-25 14:20:48 -06:00
R.B. Boyer b668131ef9
ui: pin to using bundler v1 for now (#5274) 2019-01-25 14:07:50 -06:00
Geoffrey Grosenbach 859b54a7ba Corrects defile to defined (#5262) 2019-01-25 13:45:08 -06:00
Jack Pearkes 38370278f3 fix broken link (#5273) 2019-01-25 11:40:31 -06:00
Matt Hoey 56bd1d676d website: reference last command's last field instead of background PID (#5264) 2019-01-25 17:30:38 +01:00
R.B. Boyer 7a8aa2d4a0
speed up TestHTTPAPI_MethodNotAllowed_OSS from 11s -> 0.5s (#5268) 2019-01-25 10:01:21 -06:00
Hans Hasselberg cbe53e68f0 correct name 2019-01-25 11:00:56 +01:00
Hans Hasselberg fa2d8f4568 simpler fix 2019-01-24 17:12:08 +01:00
Hans Hasselberg 944268c6a4 do not export that type 2019-01-24 17:05:57 +01:00
Hans Hasselberg d613f0ed61 fix marshalling 2019-01-24 17:03:26 +01:00
Hans Hasselberg fc2f2b6bd7 demo nomad problem 2019-01-24 16:45:54 +01:00