Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure. https://www.consul.io
Go to file
Paul Banks 36dbd878c9
Adds `api` client code and tests for new Proxy Config endpoint, registering with proxy and seeing proxy config in /agent/services list.
2018-06-14 09:41:58 -07:00
.github/ISSUE_TEMPLATE github: more tweaking of bug issue template 2018-05-10 17:29:50 -07:00
acl acl: IntentionDefault => IntentionDefaultAllow 2018-06-14 09:41:55 -07:00
agent Adds `api` client code and tests for new Proxy Config endpoint, registering with proxy and seeing proxy config in /agent/services list. 2018-06-14 09:41:58 -07:00
api Adds `api` client code and tests for new Proxy Config endpoint, registering with proxy and seeing proxy config in /agent/services list. 2018-06-14 09:41:58 -07:00
bench Gets benchmarks running again and does a rough pass for 0.7.1. 2016-11-29 13:02:26 -08:00
command Rework connect/proxy and command/connect/proxy. End to end demo working again 2018-06-14 09:41:57 -07:00
connect Fix various test failures and vet warnings. 2018-06-14 09:41:58 -07:00
demo Enables dig in cluster demo by installing dnsutils 2018-04-13 18:01:42 +01:00
ipaddr New config parser, HCL support, multiple bind addrs (#3480) 2017-09-25 11:40:42 -07:00
lib Add a helper for generating Consul's user-agent string 2018-05-25 15:50:18 -04:00
logger golint: Untangle if blocks with return in else 2017-04-25 09:26:13 -07:00
scripts Release v1.1.0 2018-05-11 14:12:40 -04:00
sentinel Renames stubs to be more consistent. 2017-11-29 18:36:52 -08:00
snapshot Removes timeout when restoring snapshots. 2017-12-13 14:10:54 -08:00
terraform Spelling (#3958) 2018-03-19 16:56:00 +00:00
test Revert "Certificate for Alice was too old, updating it for tests" 2018-05-16 18:59:57 +02:00
testrpc agent: move agent/consul/structs to agent/structs 2017-08-09 14:32:12 +02:00
testutil Spelling (#3958) 2018-03-19 16:56:00 +00:00
tlsutil 🐛 Formatting changes only; add missing trailing commas 2018-03-15 10:19:46 -07:00
types Removes remoteConsuls in favor of the new router. 2017-03-16 16:42:19 -07:00
ui v1.1.0 UI Build 2018-05-11 17:05:20 +01:00
ui-v2 Merge pull request #4225 from hashicorp/bugfix/hide-anon-acl-delete 2018-06-14 16:58:07 +01:00
vendor Remove bogus second yamux vendoring 2018-06-04 16:28:33 -04:00
version Put version.go back in dev mode 2018-05-22 10:16:59 -04:00
watch Add RunWithConfig and put Run signature back to normal 2018-05-31 20:22:14 -04:00
website Client: add metric for failed RPC calls to server 2018-06-13 12:35:45 +01:00
.gitignore Update .gitignore - ignore some macos fs event notification stuff 2018-05-24 10:34:23 -04:00
.travis.yml Travis evaluates ENV before cloning git repo and cding so we need to delay gathering packages until the makefile 2018-02-21 12:54:23 +00:00
CHANGELOG.md Update CHANGELOG.md 2018-06-13 10:36:48 -04:00
GNUmakefile Adds `api` client code and tests for new Proxy Config endpoint, registering with proxy and seeing proxy config in /agent/services list. 2018-06-14 09:41:58 -07:00
INTERNALS.md Spelling (#3958) 2018-03-19 16:56:00 +00:00
LICENSE Initial commit 2013-11-04 14:15:27 -08:00
README.md Readme for Fork Instructions 2018-06-14 09:41:39 -07:00
Vagrantfile Adds a basic Linux Vagrant setup, stolen from Nomad. 2017-10-06 08:10:12 -07:00
main.go Adds a registry mechanism for CLI commands. 2017-11-29 18:36:52 -08:00
main_test.go Adding basic CLI infrastructure 2013-12-19 11:22:08 -08:00

README.md

This is a temporary README. We'll restore the old README prior to PR upstream.

Consul Connect

This repository is the forked repository for Consul Connect work to happen in private prior to public release. This README will explain how to safely use this fork, how to bring in upstream changes, etc.

Cloning

To use this repository, clone it into your GOPATH as usual but you must rename consul-connect to consul so that Go imports continue working as usual.

Important: Never Modify Master

NEVER MODIFY MASTER! NEVER MODIFY MASTER!

We want to keep the "master" branch equivalent to OSS master. This will make rebasing easy for master. Instead, we'll use the branch f-connect. All feature branches should branch from f-connect and make PRs against f-connect.

When we're ready to merge back to upstream, we can make a single mega PR merging f-connect into OSS master. This way we don't have a sudden mega push to master on OSS.

Creating a Feature Branch

To create a feature branch, branch from f-connect:

git checkout f-connect
git checkout -b my-new-branch

All merged Connect features will be in f-connect, so you want to work from that branch. When making a PR for your feature branch, target the f-connect branch as the merge target. You can do this by using the dropdowns in the GitHub UI when creating a PR.

Syncing Upstream

First update our local master:

# This has to happen on forked master
git checkout master

# Add upstream to OSS Consul
git remote add upstream https://github.com/hashicorp/consul.git

# Fetch it
git fetch upstream

# Rebase forked master onto upstream. This should have no changes since
# we're never modifying master.
git rebase upstream master

Next, update the f-connect branch:

git checkout f-connect
git rebase origin master