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

config: turning down v1 config #4678

Merged
merged 5 commits into from
Oct 11, 2018
Merged

Conversation

alyssawilk
Copy link
Contributor

I'm inclined to make the smallest possible change, removing the v1 enabling flag, and see if it sticks.

Risk Level: High
Testing: removed the v1 compat test
Docs Changes: not with this PR
Release Notes: Inline.
Part of #4617

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk
Copy link
Contributor Author

@envoyproxy/maintainers anyone have any final objections?

Once I think we're good to merge I'll send an email to envoy-announce and ship it.

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
mattklein123
mattklein123 previously approved these changes Oct 10, 2018
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Yup, IMO this is the way to start. Obviously, unwinding v1 will also involve turning off v1 discovery fetches which can still happen via the v2 config, but I agree let's see how much complaining we get when this lands. We might even want this to be the only thing we do between now and 1.9.0 snap.

@@ -194,7 +191,7 @@ OptionsImpl::OptionsImpl(int argc, const char* const* argv,
concurrency_ = std::max(1U, concurrency.getValue());
config_path_ = config_path.getValue();
config_yaml_ = config_yaml.getValue();
v2_config_only_ = !allow_v1_config.getValue();
v2_config_only_ = true;
Copy link
Member

Choose a reason for hiding this comment

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

You could probably kill this member variable now?

@lizan
Copy link
Member

lizan commented Oct 10, 2018

Changes LGTM. Should we kill v1 docs first? v1 docs appears everywhere and in higher place than v2 docs in most of search result...

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@@ -28,7 +29,7 @@ Version history
health check/weight/metadata updates within the given duration.
* config: regex validation added to limit to a maximum of 1024 characters.
* config: v1 disabled by default. v1 support remains available until October via flipping --v2-config-only=false.
* config: v1 disabled by default. v1 support remains available until October via setting :option:`--allow-deprecated-v1-api`.
* config: v1 disabled by default. v1 support remains available until October via deprecated flag --allow-deprecated-v1-api.
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we should modify earlier release notes, this is a bit like rewriting history. Ideally once we release, they are immutable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately I had to - the :option: tag was breaking the docs build now that the flag didn't exist.
I figured as long as I was removing the tagging I should explain why.

Copy link
Member

Choose a reason for hiding this comment

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

So be it.

@alyssawilk
Copy link
Contributor Author

I'm inclined to make sure the v1 turndown sticks, but I'm happy to start the docs PR "in parallel" since digging out all the v1 references is probably going to take some time.

Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Rad!

@@ -28,7 +29,7 @@ Version history
health check/weight/metadata updates within the given duration.
* config: regex validation added to limit to a maximum of 1024 characters.
* config: v1 disabled by default. v1 support remains available until October via flipping --v2-config-only=false.
* config: v1 disabled by default. v1 support remains available until October via setting :option:`--allow-deprecated-v1-api`.
* config: v1 disabled by default. v1 support remains available until October via deprecated flag --allow-deprecated-v1-api.
Copy link
Member

Choose a reason for hiding this comment

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

So be it.

@alyssawilk alyssawilk merged commit e3a88b4 into envoyproxy:master Oct 11, 2018
@alyssawilk alyssawilk deleted the v2-only branch November 28, 2018 16:03
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