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 saving k8s deployment info to upstream #1502

Merged
merged 5 commits into from
Apr 27, 2020

Conversation

nic-chen
Copy link
Member

Summary

support saving k8s deployment info to upstream, then controller can watch k8s and update the upstream's nodes info.

@moonming
Copy link
Member

Is this PR only add schema?

@nic-chen
Copy link
Member Author

Is this PR only add schema?

yep, we just save the info here, other things can be left to the client who invoke api and k8s controller

@nic-chen nic-chen force-pushed the k8s-deployment-info branch from c37cc75 to 29680f6 Compare April 25, 2020 15:04
@@ -434,7 +434,7 @@ GET /t
local code, body = t('/apisix/admin/routes/1',
ngx.HTTP_PUT,
[[{
"service_id": "invalid_id",
"service_id": "invalid_id$",
Copy link
Member

Choose a reason for hiding this comment

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

I think you need a better invalid id, for example !@#

@nic-chen nic-chen merged commit a53b470 into apache:master Apr 27, 2020
@@ -26,7 +26,69 @@ run_tests();

__DATA__

=== TEST 1: set upstream(id: 1)
=== TEST 1: set upstream(id: 1) invalid parameters
Copy link
Member

Choose a reason for hiding this comment

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

It is best to add new test cases to the end of the file. This will not affect any existing test cases.
@nic-chen

nic-chen pushed a commit to nic-chen/apisix that referenced this pull request Apr 30, 2020
* apisix/master:
  change: limit the maximum length of Lua code to 100. (apache#1525)
  doc: fixed wrong configurations in the logger docs (apache#1530)
  feature: add batch request plugin. (apache#1388)
  plugin(kafka-logger): Updating kafka logger to use the batch processor util (apache#1358)
  test: reindex by tools `reindex`. (apache#1519)
  fix: skip tombstone mark when iterating the global values (apache#1517)
  bugfix: init `clean_handlers` when add new item from etcd. (apache#1412)
  doc: fix the doc style for serverless*.md (apache#1511)
  test: check lua code style in all Lua file under apisix/ (apache#1518)
  feat: support saving k8s deployment info to upstream (apache#1502)
  doc: update steps of build dashboard. (apache#1506)
  rocks: used tag instead of branch. (apache#1503)
  test: fix regex usage in some cases (apache#1504)
  doc: add short introduction about how to change log level (apache#1484)
  bugfix(lrucache): when creating cached objects, use resty-lock to avoid repeated creation. (apache#1486)
  bug: fixed wrong string join in limit-count plugin. (apache#1487)
  doc(readme.md): upload Node.js version for building dashboard. (apache#1485)
  release: released 1.2 version. (apache#1436)

# Conflicts:
#	bin/apisix
#	t/node/upstream.t
SaberMaster pushed a commit to SaberMaster/incubator-apisix that referenced this pull request Jun 30, 2020
* feat: support save k8s deployment info to upstream
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