Skip to content
This repository has been archived by the owner on Aug 25, 2021. It is now read-only.

Deprecate connectInject.centralConfig #763

Merged
merged 6 commits into from
Jan 26, 2021

Conversation

lkysow
Copy link
Member

@lkysow lkysow commented Jan 11, 2021

Changes proposed in this PR:

  • Remove support for connectInject.centralConfig.defaultProtocol. Use of this setting will now cause an error on helm upgrade.
  • Remove support for connectInject.centralConfig.proxyDefaults. Use of this setting will now cause an error on helm upgrade.
  • Remove support for setting connectInject.centralConfig.enabled to false. Its default was previously true but we did allow you to set it to false if you weren't using connect inject. Now you can't set it at all and we default it to true. Consul made the default true in 1.9.0 and removing the ability to set it to false in the Helm chart lets us fully remove the connectInject.centralConfig block. Users can still set it to false via extraConfig.
  • Remove support for meshGateway.globalMode. Use of this setting will now cause an error on helm upgrade.

How I've tested this PR:

  • I'm testing the failure messages in one location: connect-inject-deployment.bats because that's where the fail commands are.
  • I've removed the tests about setting centralConfig.enabled to false and kept the tests that ensure it's set to true by default.

How I expect reviewers to test this PR:

  • code

Checklist:

@lkysow lkysow force-pushed the deprecate-central-config branch 4 times, most recently from 3c99936 to e33b7f0 Compare January 12, 2021 01:03
@lkysow lkysow marked this pull request as ready for review January 12, 2021 23:20
@lkysow
Copy link
Member Author

lkysow commented Jan 13, 2021

I forgot to add the meshGateway.globalMode removal.

Copy link
Contributor

@thisisnotashwin thisisnotashwin left a comment

Choose a reason for hiding this comment

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

This looks great. Have a question about some deleted tests in client-daemonset.bats. And as you mentioned, the CHANGELOG entry for meshgateway removal

CHANGELOG.md Outdated Show resolved Hide resolved
test/unit/client-daemonset.bats Outdated Show resolved Hide resolved
test/unit/connect-inject-deployment.bats Outdated Show resolved Hide resolved
@@ -154,7 +154,7 @@ jobs:
-kubecontext="kind-dc1" \
-secondary-kubecontext="kind-dc2" \
-debug-directory="$TEST_RESULTS/debug" \
-consul-k8s-image=hashicorpdev/consul-k8s:latest
-consul-k8s-image=ghcr.io/lkysow/consul-k8s-dev:jan11
Copy link
Contributor

Choose a reason for hiding this comment

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

just a reminder to delete this pre-merging

Copy link
Contributor

@thisisnotashwin thisisnotashwin left a comment

Choose a reason for hiding this comment

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

This looks great. Will hit approve once the changelog has the addition for meshgateway!! Great job Luke

CHANGELOG.md Show resolved Hide resolved
Copy link
Contributor

@thisisnotashwin thisisnotashwin left a comment

Choose a reason for hiding this comment

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

❤️

@lkysow
Copy link
Member Author

lkysow commented Jan 13, 2021

I forgot to add the meshGateway.globalMode removal.

I've added this removal now.

Copy link
Contributor

@ishustava ishustava left a comment

Choose a reason for hiding this comment

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

This looks good! My only comment that I think is currently blocking is about handling a case when .Values.connectInject.centralConfig is set to true. This could be the case if you are super explicit in your helm config and still set it, even though the default was true.

CHANGELOG.md Outdated Show resolved Hide resolved
templates/connect-inject-deployment.yaml Show resolved Hide resolved
@thisisnotashwin thisisnotashwin merged commit ef4ef6b into master Jan 26, 2021
@thisisnotashwin thisisnotashwin deleted the deprecate-central-config branch January 26, 2021 17:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants