Update consul-template to v0.24.1 and remove deprecated vault grace #7170

fredrikhgrelland · 2020-02-17T18:53:56Z

Fixes #6946
Needed consul connect ca features of consul-template in nomad.

fredrikhgrelland · 2020-02-18T12:03:13Z

@schmichael I needed the new template features for consul connect in a presentation.
I hope this helps to get the consul-template library updated in nomad.

jescalan

Docs changes are good!

schmichael

Thanks @fredrikhgrelland !

For the next release we should emit a warning before removing the field entirely. I made comments that should guide you through the required changes.

Let me know if you don't have time to make the changes, and I can do it.

Thanks again!

command/agent/job_endpoint.go

jobspec/parse_task.go

nomad/structs/structs.go

schmichael · 2020-02-19T19:06:36Z

We'll also need to add a changelog entry and section to https://github.com/hashicorp/nomad/blob/master/website/pages/guides/upgrade/upgrade-specific.mdx

We can always do that in a followup PR.

…eriod (hashicorp#7170)

fredrikhgrelland · 2020-02-19T23:06:15Z

@schmichael I implemented the suggested changes and added the documentation. Let me know if there is anything else.

fredrikhgrelland · 2020-02-19T23:54:46Z

Found a panic when posting job. Will investigate.

schmichael · 2020-02-20T16:38:07Z

api/tasks.go

@@ -737,9 +737,6 @@ func (tmpl *Template) Canonicalize() {
 	if tmpl.Envvars == nil {
 		tmpl.Envvars = boolToPtr(false)
 	}
-	if tmpl.VaultGrace == nil {
-		tmpl.VaultGrace = timeToPtr(15 * time.Second)


Removing this is probably the source of panics/issues. It ensured VaultGrace was always initialized (never nil) in the HTTP API.

Removing this code is the right thing to do. We just need to fix any code that depended on VaultGrace always being non-nil. I'll investigate and try to help.

Sorry haven't found time today to fix this up. The really sneaky place that converts public api structs to internal nomad/structs structs is hidden in the job endpoint here: https://github.com/hashicorp/nomad/blob/v0.10.4/command/agent/job_endpoint.go#L620

That may need updating to convert nil api VaultGrace values to 0 nomad/struct VaultGrace values.

See comment below.

…ashicorp#7170)

fredrikhgrelland · 2020-02-22T10:06:39Z

jobspec/parse_task.go

@@ -374,6 +374,7 @@ func parseTemplates(result *[]*api.Template, list *ast.ObjectList) error {
 			ChangeMode: helper.StringToPtr("restart"),
 			Splay:      helper.TimeToPtr(5 * time.Second),
 			Perms:      helper.StringToPtr("0644"),
+			VaultGrace: helper.TimeToPtr(0),


Added default value in parser. Time.period can not be nil.
This allows for silent parsing when vault_grace is not set or set to 0. Warning when set to a non zero value.

…ashicorp#7170)

fredrikhgrelland · 2020-02-22T16:39:01Z

@schmichael Apologies for all the pushes. I have added warnings to templates, and made changes to the documentation and change log to match the current situation.
Nomad will happily run with and without vault_grace set, I am however not able to figure out the tests. The addition of VaultGrace: helper.TimeToPtr(0), in parseTemplates might not be the most elegant solution-
Please have a look at the current state. I am happy to do more changes, but without more experience with this code base I am a bit stuck now.

…ashicorp#7170)

schmichael

Thanks for your hard work on this @fredrikhgrelland ! I can take over any test failures from here. I really appreciate you sticking with this. There is a lot of plumbing involved in jobspec handling.

Followup to #7170 - Moved canonicalization of VaultGrace back into `api/` package. - Fixed tests. - Made docs styling consistent.

github-actions · 2023-01-16T02:16:07Z

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.

fredrikhgrelland requested a review from a team as a code owner February 17, 2020 18:53

jescalan approved these changes Feb 18, 2020

View reviewed changes

schmichael requested changes Feb 19, 2020

View reviewed changes

command/agent/job_endpoint.go Outdated Show resolved Hide resolved

jobspec/parse_task.go Outdated Show resolved Hide resolved

nomad/structs/structs.go Show resolved Hide resolved

nomad/structs/structs.go Show resolved Hide resolved

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 19, 2020

Implementing suggested changes hashicorp#7170

f8e45c8

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 19, 2020

Implementing suggested changes hashicorp#7170

1214bef

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 19, 2020

Implementing suggested changes (hashicorp#7170)

a92beba

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 19, 2020

Update consul-template to v0.24.1 and remove deprecated vault grace p…

a4f98ab

…eriod (hashicorp#7170)

fredrikhgrelland force-pushed the consul_template_upgrade branch from a92beba to a4f98ab Compare February 19, 2020 22:30

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 19, 2020

Update consul-template to v0.24.1 and remove deprecated vault grace p…

01e9814

…eriod (hashicorp#7170)

fredrikhgrelland force-pushed the consul_template_upgrade branch from a4f98ab to 01e9814 Compare February 19, 2020 23:03

schmichael reviewed Feb 20, 2020

View reviewed changes

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 22, 2020

Update consul-template to v0.24.1 and remove deprecated vault_grace (h…

fb61a83

…ashicorp#7170)

fredrikhgrelland force-pushed the consul_template_upgrade branch from 01e9814 to fb61a83 Compare February 22, 2020 09:57

fredrikhgrelland commented Feb 22, 2020

View reviewed changes

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 22, 2020

Update consul-template to v0.24.1 and remove deprecated vault_grace (h…

611d4e7

…ashicorp#7170)

fredrikhgrelland force-pushed the consul_template_upgrade branch from fb61a83 to 611d4e7 Compare February 22, 2020 12:09

fredrikhgrelland pushed a commit to fredrikhgrelland/nomad that referenced this pull request Feb 22, 2020

Update consul-template to v0.24.1 and remove deprecated vault_grace (h…

24abfb0

…ashicorp#7170)

fredrikhgrelland force-pushed the consul_template_upgrade branch from 611d4e7 to 24abfb0 Compare February 22, 2020 16:30

Update consul-template to v0.24.1 and remove deprecated vault_grace (h…

26cca14

…ashicorp#7170)

fredrikhgrelland force-pushed the consul_template_upgrade branch from 24abfb0 to 26cca14 Compare February 23, 2020 15:25

fredrikhgrelland requested a review from schmichael March 9, 2020 11:59

schmichael requested a review from jescalan March 10, 2020 21:14

schmichael approved these changes Mar 10, 2020

View reviewed changes

schmichael merged commit 64c40af into hashicorp:master Mar 10, 2020

schmichael added a commit that referenced this pull request Mar 10, 2020

jobspec: fixup vault_grace deprecation

d145b39

Followup to #7170 - Moved canonicalization of VaultGrace back into `api/` package. - Fixed tests. - Made docs styling consistent.

schmichael mentioned this pull request Mar 10, 2020

jobspec: fixup vault_grace deprecation #7310

Merged

github-actions bot locked as resolved and limited conversation to collaborators Jan 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update consul-template to v0.24.1 and remove deprecated vault grace #7170

Update consul-template to v0.24.1 and remove deprecated vault grace #7170

fredrikhgrelland commented Feb 17, 2020

fredrikhgrelland commented Feb 18, 2020

jescalan left a comment

schmichael left a comment

schmichael commented Feb 19, 2020

fredrikhgrelland commented Feb 19, 2020

fredrikhgrelland commented Feb 19, 2020

schmichael Feb 20, 2020

schmichael Feb 20, 2020

fredrikhgrelland Feb 22, 2020

fredrikhgrelland Feb 22, 2020

fredrikhgrelland commented Feb 22, 2020

schmichael left a comment

github-actions bot commented Jan 16, 2023

Update consul-template to v0.24.1 and remove deprecated vault grace #7170

Update consul-template to v0.24.1 and remove deprecated vault grace #7170

Conversation

fredrikhgrelland commented Feb 17, 2020

fredrikhgrelland commented Feb 18, 2020

jescalan left a comment

Choose a reason for hiding this comment

schmichael left a comment

Choose a reason for hiding this comment

schmichael commented Feb 19, 2020

fredrikhgrelland commented Feb 19, 2020

fredrikhgrelland commented Feb 19, 2020

schmichael Feb 20, 2020

Choose a reason for hiding this comment

schmichael Feb 20, 2020

Choose a reason for hiding this comment

fredrikhgrelland Feb 22, 2020

Choose a reason for hiding this comment

fredrikhgrelland Feb 22, 2020

Choose a reason for hiding this comment

fredrikhgrelland commented Feb 22, 2020

schmichael left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 16, 2023