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.

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

Update consul-template to latest for pkiCert fix #16087

Merged
merged 8 commits into from
Jun 27, 2022
Merged

Conversation

swenson
Copy link
Contributor

@swenson swenson commented Jun 21, 2022

So that we get the fix in hashicorp/consul-template#1590.

I tested manually that this no longer causes pkiCert to get into an
infinite failure loop when the cert expires.

So that we get the fix in hashicorp/consul-template#1590.

I tested manually that this no longer causes `pkiCert` to get into an
infinite failure loop when the cert expires.
go.mod Outdated Show resolved Hide resolved
@@ -295,6 +295,7 @@ require (
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/mdns v1.0.4 // indirect
github.com/hashicorp/serf v0.9.6 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.1.0 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

How come this is adding an indirect dep to vault, does go mod tidy clean this up?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

go mod tidy is what added this :)

Copy link
Member

Choose a reason for hiding this comment

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

It looks like that dep was added to consul-template recently: hashicorp/consul-template#1580

Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should add an explicit replace at the top of this file like the other hashicorp/vault/api deps?

replace github.com/hashicorp/vault/api/auth/kubernetes => ./api/auth/kubernetes

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah I think this makes sense. Looks like we do this for userpass and approle too.

@swenson swenson requested a review from taoism4504 as a code owner June 24, 2022 21:37
@swenson swenson requested review from tvoran and calvn June 24, 2022 21:37
@swenson
Copy link
Contributor Author

swenson commented Jun 24, 2022

Updated with official 0.29.1 fix, and updated docs. Please take another look.

Copy link
Contributor

@tomhjp tomhjp left a comment

Choose a reason for hiding this comment

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

LGTM

website/content/docs/agent/template.mdx Outdated Show resolved Hide resolved
@@ -295,6 +295,7 @@ require (
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/mdns v1.0.4 // indirect
github.com/hashicorp/serf v0.9.6 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.1.0 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should add an explicit replace at the top of this file like the other hashicorp/vault/api deps?

replace github.com/hashicorp/vault/api/auth/kubernetes => ./api/auth/kubernetes

Copy link
Contributor

@calvn calvn left a comment

Choose a reason for hiding this comment

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

LGTM once Theron's comments are resolved :)

swenson and others added 3 commits June 24, 2022 15:34
@swenson swenson merged commit c165363 into main Jun 27, 2022
@swenson swenson deleted the consul-template-latest branch June 27, 2022 15:39
swenson added a commit that referenced this pull request Jun 27, 2022
cherry-picked c165363

Update consul-template to latest for pkiCert fix

So that we get the fixes in hashicorp/consul-template#1590
and hashicorp/consul-template#1591.

I tested manually that this no longer causes `pkiCert` to get into an
infinite failure loop when the cert expires, and that the key and CA certificate are also accessible.

Co-authored-by: Theron Voran <tvoran@users.noreply.github.com>
swenson added a commit that referenced this pull request Jun 27, 2022
cherry-picked c165363

Update consul-template to latest for pkiCert fix

So that we get the fixes in hashicorp/consul-template#1590
and hashicorp/consul-template#1591.

I tested manually that this no longer causes `pkiCert` to get into an
infinite failure loop when the cert expires, and that the key and CA certificate are also accessible.

Co-authored-by: Theron Voran <tvoran@users.noreply.github.com>

Co-authored-by: Christopher Swenson <swenson@swenson.io>
Co-authored-by: Theron Voran <tvoran@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants