From de070c4ef930ab8c908850e9a383f3f557d1b36b Mon Sep 17 00:00:00 2001 From: Xin Rong Date: Mon, 26 Dec 2022 17:23:31 +0800 Subject: [PATCH] fix: bad configuration item: apisix-admin-api-version (#1551) Co-authored-by: Jintao Zhang --- conf/config-default.yaml | 3 ++- pkg/config/config.go | 4 ++++ pkg/config/config_test.go | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/conf/config-default.yaml b/conf/config-default.yaml index 8cad9f251e..7610ded4a1 100644 --- a/conf/config-default.yaml +++ b/conf/config-default.yaml @@ -49,7 +49,6 @@ ingress_status_address: [] # when there is no available information on the Ser # For example, no available LB exists in the bare metal environment. enable_profiling: true # enable profiling via web interfaces # host:port/debug/pprof, default is true. -apisix-admin-api-version: "v2" # the APISIX admin API version. can be "v2" or "v3" apisix-resource-sync-interval: "300s" # Default interval for synchronizing Kubernetes resources to APISIX # Kubernetes related configurations. kubernetes: @@ -85,6 +84,8 @@ kubernetes: plugin_metadata_cm: plugin-metadata-config-map # APISIX related configurations. apisix: + admin_api_version: v3 # the APISIX admin API version. can be "v2" or "v3" + default_cluster_base_url: "http://127.0.0.1:9080/apisix/admin" # The base url of admin api / manager api # of the default APISIX cluster diff --git a/pkg/config/config.go b/pkg/config/config.go index fd255c797d..c5718e4949 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -142,6 +142,10 @@ func NewDefaultConfig() *Config { WatchEndpointSlices: false, EnableGatewayAPI: false, }, + APISIX: APISIXConfig{ + AdminAPIVersion: "v3", + DefaultClusterName: "default", + }, } } diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index b26c3575ac..dfb7dc1065 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -50,6 +50,7 @@ func TestNewConfigFromFile(t *testing.T) { APIVersion: DefaultAPIVersion, }, APISIX: APISIXConfig{ + AdminAPIVersion: "v2", DefaultClusterName: "apisix", DefaultClusterBaseURL: "http://127.0.0.1:8080/apisix", DefaultClusterAdminKey: "123456", @@ -94,6 +95,7 @@ kubernetes: ingress_version: networking/v1 api_version: apisix.apache.org/v2 apisix: + admin_api_version: v2 default_cluster_base_url: http://127.0.0.1:8080/apisix default_cluster_admin_key: "123456" default_cluster_name: "apisix" @@ -138,6 +140,7 @@ func TestConfigWithEnvVar(t *testing.T) { APIVersion: DefaultAPIVersion, }, APISIX: APISIXConfig{ + AdminAPIVersion: "v2", DefaultClusterName: "apisix", DefaultClusterBaseURL: "http://127.0.0.1:8080/apisix", DefaultClusterAdminKey: "123456", @@ -173,6 +176,7 @@ func TestConfigWithEnvVar(t *testing.T) { "ingress_version": "networking/v1" }, "apisix": { + "admin_api_version": "v2", "default_cluster_base_url": "{{.DEFAULT_CLUSTER_BASE_URL}}", "default_cluster_admin_key": "{{.DEFAULT_CLUSTER_ADMIN_KEY}}", "default_cluster_name": "{{.DEFAULT_CLUSTER_NAME}}" @@ -209,6 +213,7 @@ kubernetes: ingress_class: apisix ingress_version: networking/v1 apisix: + admin_api_version: v2 default_cluster_base_url: {{.DEFAULT_CLUSTER_BASE_URL}} default_cluster_admin_key: "{{.DEFAULT_CLUSTER_ADMIN_KEY}}" default_cluster_name: "{{.DEFAULT_CLUSTER_NAME}}"