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

Revert 1.12 TLS config to ensure 1.11 image is also supported. #1218

Merged
merged 1 commit into from
May 11, 2022

Conversation

thisisnotashwin
Copy link
Contributor

@thisisnotashwin thisisnotashwin commented May 10, 2022

Changes proposed in this PR:

  • Revert 1.12 TLS config to ensure 1.11 image is also supported when Vault is disabled.
  • Revert this commit when we want to stop supporting 1.11 style TLS config.

How I've tested this PR:

  • Deployed the helm chart with the 1.11 image with various combinations of TLS enabled/disabled, tls verify enabled/disabled and autoencrypt enabled/disabled.

How I expect reviewers to test this PR:

  • 👀

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)

@thisisnotashwin thisisnotashwin force-pushed the ashwin/revert-tls-config branch from cfc93e0 to 387d27a Compare May 10, 2022 15:54
@thisisnotashwin thisisnotashwin marked this pull request as ready for review May 10, 2022 18:36
- Revert this commit when we want to stop supporting 1.11 style TLS
  config.
@thisisnotashwin thisisnotashwin force-pushed the ashwin/revert-tls-config branch from 387d27a to 28c4e3f Compare May 10, 2022 18:37
@thisisnotashwin thisisnotashwin requested review from a team, jmurret and kschoche and removed request for a team May 10, 2022 18:38
Copy link
Member

@jmurret jmurret left a comment

Choose a reason for hiding this comment

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

👍 Nice work ashwin!

@@ -2,7 +2,7 @@

BREAKING CHANGES:
* Helm
* Using the Vault integration requires Consul 1.12.0+. [[GH-1213](https://github.com/hashicorp/consul-k8s/pull/1213)]
* Using the Vault integration requires Consul 1.12.0+. [[GH-1213](https://github.com/hashicorp/consul-k8s/pull/1213)], [[GH-1218](https://github.com/hashicorp/consul-k8s/pull/1218)]
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry not trying to be nitpicky here, but should we specify if this is Vault as the connect-ca, or the vault secrets backend or both?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think most users who are using Vault for either will be ok migrating to 1.12 which is why this was left generic.

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool that makes sense!

{{- end }}
}
},
{{- if .Values.global.secretsBackend.vault.enabled }}
Copy link
Contributor

Choose a reason for hiding this comment

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

This might be my browser but it looks like the indentation is off for these two blocks. I don't think it makes a functional difference tho with JSON?

Copy link
Contributor

@kschoche kschoche left a comment

Choose a reason for hiding this comment

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

Looks great!

@thisisnotashwin thisisnotashwin merged commit 53e191b into main May 11, 2022
@thisisnotashwin thisisnotashwin deleted the ashwin/revert-tls-config branch May 11, 2022 15:46
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.

3 participants