Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

Conversation

@nelsam
Copy link
Contributor

@nelsam nelsam commented Jun 13, 2016

  • Adds properties for loggregator to work with etcd-tls
  • Adds consul agents to templates that have metron agents
  • Adds etcd TLS properties to template
  • Changes etcd.require_ssl and etcd.peer_require_ssl to merge from stub with a default of false, rather than being forced to false

The first commit shouldn't have any changes that collide with changes from other teams. The second commit is separate because it has changes related to more global properties, which may have conflicts with changes from other teams.

Warren Fernandes added 2 commits June 13, 2016 14:12
- Adds consul_agent to all jobs with metron_agent

[#121255441]

Signed-off-by: Sam Nelson <[email protected]>
@cf-gitbot
Copy link
Collaborator

We have created an issue in Pivotal Tracker to manage this:

https://www.pivotaltracker.com/story/show/121448173

The labels on this github issue will be updated when the story is started.

@cfdreddbot
Copy link

Hey nelsam!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you and the commit authors have already signed the CLA.

templates/cf.yml Outdated
release: (( meta.capi_release_name ))
- name: metron_agent
release: (( meta.loggregator_release_name ))
- name: consul_agent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consul_agent needs to be first everywhere

ca_cert: ~
etcd:
ca_cert: (( .properties.etcd.ca_cert ))
require_ssl: (( .properties.etcd.require_ssl ))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you also need cluster here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cluster configuration is directly under the etcd properties line 582. These properties are to provide our components (Doppler, TrafficController, MetronAgent, SyslogDrainBinder) with the etcd ca_cert, require_ssl, and machines

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds like some of the etcd properties you're copying over into the loggregator.etcd namespace, but stuff like cluster you're taking directly from the etcd namespace?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. That is correct. The clients don't care about the cluster.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. The clients don't care about cluster, but they do need to know how to talk to the server, which is what "machines" is for. Now this tricky. In non-tls mode, the "machines" should be the list of IPs. But in TLS mode, it should be the single DNS name of the secure etcd cluster, in this case "cf-etcd.service.cf.internal". See e.g. https://github.com/cloudfoundry-incubator/diego-release/blob/develop/jobs/bbs/spec#L59-L61. I'm not sure what the right thing to do here for spiff.

consul:
agent:
services:
etcd: {name: cf-etcd}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanted to point this out, we named this cf-etcd in comparison to other-etcd. The certs should have common name of cf-etcd.service.cf.internal

@Amit-PivotalLabs
Copy link
Contributor

Please make sure the unit tests pass on cf-release with these changes. In its current state, this PR will fail. The best thing to do is to run ./scripts/setup-git-hooks from the cf-release directory on your workstation so that it runs unit tests whenever you try to commit.

@Amit-PivotalLabs
Copy link
Contributor

@nelsam @wfernandes Did you intend to continue working on this? If not, you could simply wait until the Infrastructure team adds this stuff in anyways. It might be a while, as we're working on the component to support zero-downtime switch to etcd in TLS mode. In that case, we could close out this PR.

@wfernandes
Copy link
Contributor

@Amit-PivotalLabs We have stopped working on the etcd-tls epic unless/until we need to fix something. So no pressure from us. :)

@Amit-PivotalLabs
Copy link
Contributor

Closing this PR, we have this story: https://www.pivotaltracker.com/story/show/122070663.

Will link to this PR for context.

@Amit-PivotalLabs Amit-PivotalLabs deleted the loggregator-etcd-tls branch August 12, 2016 17:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants