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

feat: support to communicate with etcd by TLS in command line #3415

Merged
merged 22 commits into from
Feb 1, 2021

Conversation

tokers
Copy link
Contributor

@tokers tokers commented Jan 25, 2021

What this PR does / why we need it:

This PR implements the SSL handshaking to etcd cluster in the APISIX command line tool, and it will obey the TLS configuration in config.yaml.

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

@tokers tokers linked an issue Jan 25, 2021 that may be closed by this pull request
@membphis
Copy link
Member

doc/install-dependencies.md Outdated Show resolved Hide resolved
doc/install-dependencies.md Outdated Show resolved Hide resolved
@tokers tokers force-pushed the feat/support-etcd-tls-in-cli branch from 2c42309 to a956ba5 Compare January 29, 2021 07:27
Copy link
Member

@membphis membphis left a comment

Choose a reason for hiding this comment

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

we need to fix #3461 issue first.

this PR may fail after we used luajit in CLI.

else
@echo "WARN: You're not using LuaRocks 3.x, please add the following items to your LuaRocks config file:"
Copy link
Member

Choose a reason for hiding this comment

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

nice warning

@tokers
Copy link
Contributor Author

tokers commented Jan 30, 2021

we need to fix #3461 issue first.

this PR may fail after we used luajit in CLI.

Happy to do adjusting after the #3461 fixed.

Copy link
Member

@Yiyiyimu Yiyiyimu left a comment

Choose a reason for hiding this comment

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

LGTM

@Yiyiyimu
Copy link
Member

Yiyiyimu commented Feb 1, 2021

Hi @tokers since #3461 got fixed, do you mind merge master and see how it works

@@ -194,6 +194,13 @@ tengine_install() {
cp -r ${OPENRESTY_PREFIX}/* build-cache${OPENRESTY_PREFIX}
ls build-cache${OPENRESTY_PREFIX}
rm -rf openresty-${OPENRESTY_VERSION}

Copy link
Member

Choose a reason for hiding this comment

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

do we still support tengine now?

@@ -16,11 +16,19 @@
# limitations under the License.
#

Copy link
Member

Choose a reason for hiding this comment

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

are we not support luarocks 2.x?

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 LuaRocks 3.x is better to use?

Copy link
Member

Choose a reason for hiding this comment

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

agreed. So Apache APISIX not support luarocks 2.x, right?

@tokers
Copy link
Contributor Author

tokers commented Feb 1, 2021

Hi @tokers since #3461 got fixed, do you mind merge master and see how it works

OK, I'll.

@tokers tokers force-pushed the feat/support-etcd-tls-in-cli branch from a956ba5 to 18f2a19 Compare February 1, 2021 02:19
@tokers
Copy link
Contributor Author

tokers commented Feb 1, 2021

Hi @tokers since #3461 got fixed, do you mind merge master and see how it works

OK, I'll.

Updated.

@Yiyiyimu Yiyiyimu merged commit 5399a31 into apache:master Feb 1, 2021
@Yiyiyimu Yiyiyimu mentioned this pull request Feb 1, 2021
4 tasks
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.

Support disable ssl verify for etcd connection
5 participants