Skip to content

helm/vitess/templates/_vtctld.tpl: Revert web_dir changes#5744

Merged
morgo merged 1 commit intovitessio:masterfrom
planetscale:gedgar-vtctld-web_dir-revert
Jan 21, 2020
Merged

helm/vitess/templates/_vtctld.tpl: Revert web_dir changes#5744
morgo merged 1 commit intovitessio:masterfrom
planetscale:gedgar-vtctld-web_dir-revert

Conversation

@gedgar
Copy link
Copy Markdown

@gedgar gedgar commented Jan 21, 2020

Fixes #5720 until we can push a helm v2.0 release alongside 5.0.
See this comment.

CC @derekperkins @morgo @rohit-nayak-ps

Signed-off-by: Gary Edgar gary@planetscale.com

Signed-off-by: Gary Edgar <gary@planetscale.com>
@morgo
Copy link
Copy Markdown
Contributor

morgo commented Jan 21, 2020

I chatted with @rohit-nayak-ps on this, and I think what we will do is make Vitess 5.0 support these two parameters as a noop, and then remove them in Vitess 6.0.

So with that understanding, this looks good to merge for handling 4.0, and 5.0 with Rohit's fix (planned to work on tomorrow). We can then remove this again towards the start of the 6.0 development cycle.

@morgo morgo self-requested a review January 21, 2020 18:20
@morgo morgo merged commit f495d27 into vitessio:master Jan 21, 2020
@gedgar gedgar deleted the gedgar-vtctld-web_dir-revert branch January 21, 2020 19:07
@morgo
Copy link
Copy Markdown
Contributor

morgo commented Jan 22, 2020

The related patch is #5747 (noop if these options are specified).

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.

helm/vitess/templates/_vtctld.tpl: Removal of web_dir flags can break UI for older binaries

2 participants