[apisix-ingress-controller] branch master updated: chore: refactor conf/ directory (#131)

[kv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kvn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 50cffb0  chore: refactor conf/ directory (#131)
50cffb0 is described below

commit 50cffb0070c7803c37ca5006a2e9c1dbdd22904a
Author: Alex Zhang <zc...@gmail.com>
AuthorDate: Sat Dec 26 23:21:59 2020 +0800

    chore: refactor conf/ directory (#131)
---
 conf/conf.json              | 13 -------------
 conf/config-default.json    | 13 +++++++++++++
 conf/{config => kubeconfig} |  0
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/conf/conf.json b/conf/conf.json
deleted file mode 100644
index 0b2edf7..0000000
--- a/conf/conf.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "conf":{
-    "k8sAuth":{
-      "file": "conf/config"
-    },
-    "syslog":{
-      "host": "localhost"
-    },
-    "apisix":{
-      "base_url": "http://172.16.20.90:30116/apisix/admin"
-    }
-  }
-}
diff --git a/conf/config-default.json b/conf/config-default.json
new file mode 100644
index 0000000..44f53cb
--- /dev/null
+++ b/conf/config-default.json
@@ -0,0 +1,13 @@
+{
+  "log_level": "info",
+  "log_output": "stderr",
+  "http_listen": ":8080",
+  "enable_profiling": true,
+  "kubernetes": {
+    "kubeconfig": "",
+    "resync_interval": "60s"
+  },
+  "apisix": {
+    "base_url": "http://127.0.0.1:9080/apisix/admin"
+  }
+}
diff --git a/conf/config b/conf/kubeconfig
similarity index 100%
rename from conf/config
rename to conf/kubeconfig