Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase consul template and make Nomad environment variables available #2209

Merged
merged 13 commits into from
Jan 23, 2017
Merged

Rebase consul template and make Nomad environment variables available #2209

merged 13 commits into from
Jan 23, 2017

Conversation

dadgar
Copy link
Contributor

@dadgar dadgar commented Jan 17, 2017

This PR:

  1. Updates consul-template
  2. Allows interpolation of Nomad environment variables in the template block

Fixes #2066
Fixes #1979

sethvargo
sethvargo reviewed Jan 17, 2017
View reviewed changes
client/consul_template.go
Wait: &watch.Wait{},
}
ct := ctconf.DefaultTemplateConfig()
ct.Source = &src
Copy link
Contributor

Choose a reason for hiding this comment

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

There are config helpers that assist in taking the address of things:

config.String("foo")

but this works too

client/consul_template.go
@@ -401,34 +400,29 @@ func parseTemplateConfigs(tmpls []*structs.Template, taskDir string,
// runnerConfig returns a consul-template runner configuration, setting the
// Vault and Consul configurations based on the clients configs.
func runnerConfig(config *config.Config, vaultToken string) (*ctconf.Config, error) {
conf := &ctconf.Config{}
conf := ctconf.DefaultConfig()
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not seeing a place where you finalize this config.

@jippi
Copy link
Contributor

jippi commented Jan 18, 2017

Will the updates consul-template still support the deprecated key_or_default for a smooth migration path into keyOrDefault ?

@sethvargo
Copy link
Contributor

Consul Template supports key_or_default and keyOrDefault. The underscore version is deprecated, but works.

@dadgar dadgar merged commit 5d2e8e9 into master Jan 23, 2017
@dadgar dadgar deleted the f-consul-template branch January 23, 2017 19:16
@github-actions
Copy link

github-actions bot commented Apr 6, 2023

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sethvargo sethvargo sethvargo left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dadgar @jippi @sethvargo