diff --git a/docs/en/latest/deployments/ack.md b/docs/en/latest/deployments/ack.md index 02d959a7ec..a5d65b8152 100644 --- a/docs/en/latest/deployments/ack.md +++ b/docs/en/latest/deployments/ack.md @@ -117,7 +117,7 @@ You should now be able to use APISIX ingress controller. You can try running thi ### Enable SSL -SSL is disabled by default. You can enable it by adding the flag `--set gateway.tls.enabled=true`. +SSL is disabled by default. You can enable it by adding the flag `--set apisix.ssl.enabled=true`. ### Change default keys diff --git a/docs/en/latest/deployments/aws.md b/docs/en/latest/deployments/aws.md index b267879f8d..7305f79280 100644 --- a/docs/en/latest/deployments/aws.md +++ b/docs/en/latest/deployments/aws.md @@ -70,7 +70,7 @@ helm install apisix apisix/apisix \ --namespace ingress-apisix \ --set ingress-controller.config.apisix.serviceNamespace=ingress-apisix \ --set ingress-controller.config.apisix.adminAPIVersion=$ADMIN_API_VERSION \ - --set gateway.tls.enabled=true \ + --set apisix.ssl.enabled=true \ --set gateway.annotations."service\.beta\.kubernetes\.io/aws-load-balancer-type"=nlb ``` @@ -125,7 +125,7 @@ You should now be able to use APISIX ingress controller. You can try running thi ### Enable SSL -SSL is disabled by default. You can enable it by adding the flag `--set gateway.tls.enabled=true`. +SSL is disabled by default. You can enable it by adding the flag `--set apisix.ssl.enabled=true`. ### Change default keys diff --git a/docs/en/latest/deployments/azure.md b/docs/en/latest/deployments/azure.md index 4a08e160e3..343fb742ca 100644 --- a/docs/en/latest/deployments/azure.md +++ b/docs/en/latest/deployments/azure.md @@ -106,7 +106,7 @@ You should now be able to use APISIX ingress controller. You can try running thi ### Enable SSL -SSL is disabled by default. You can enable it by adding the flag `--set gateway.tls.enabled=true`. +SSL is disabled by default. You can enable it by adding the flag `--set apisix.ssl.enabled=true`. ### Change default keys diff --git a/docs/en/latest/deployments/gke.md b/docs/en/latest/deployments/gke.md index 84e341b371..a460e52c8a 100644 --- a/docs/en/latest/deployments/gke.md +++ b/docs/en/latest/deployments/gke.md @@ -103,7 +103,7 @@ You should now be able to use APISIX ingress controller. You can try running thi ### Enable SSL -SSL is disabled by default. You can enable it by adding the flag `--set gateway.tls.enabled=true`. +SSL is disabled by default. You can enable it by adding the flag `--set apisix.ssl.enabled=true`. ### Change default keys diff --git a/docs/en/latest/deployments/k3s-rke.md b/docs/en/latest/deployments/k3s-rke.md index 94618ae642..59bd1ed592 100644 --- a/docs/en/latest/deployments/k3s-rke.md +++ b/docs/en/latest/deployments/k3s-rke.md @@ -51,7 +51,7 @@ helm repo update # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --create-namespace \ --namespace ingress-apisix \ diff --git a/docs/en/latest/deployments/kind.md b/docs/en/latest/deployments/kind.md index 62caaad75f..0c38a115d6 100644 --- a/docs/en/latest/deployments/kind.md +++ b/docs/en/latest/deployments/kind.md @@ -62,7 +62,7 @@ helm repo update # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --create-namespace \ --namespace ingress-apisix \ diff --git a/docs/en/latest/deployments/kubesphere.md b/docs/en/latest/deployments/kubesphere.md index 82001819b9..e8aa8de070 100644 --- a/docs/en/latest/deployments/kubesphere.md +++ b/docs/en/latest/deployments/kubesphere.md @@ -46,7 +46,7 @@ helm repo update # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --create-namespace \ --namespace ingress-apisix \ @@ -96,7 +96,7 @@ You should now be able to use APISIX ingress controller. You can try running thi ### Enable SSL -SSL is disabled by default. You can enable it by adding the flag `--set gateway.tls.enabled=true`. +SSL is disabled by default. You can enable it by adding the flag `--set apisix.ssl.enabled=true`. ### Change default keys diff --git a/docs/en/latest/deployments/minikube.md b/docs/en/latest/deployments/minikube.md index 06cfc93eb9..b1e1cc266e 100644 --- a/docs/en/latest/deployments/minikube.md +++ b/docs/en/latest/deployments/minikube.md @@ -45,7 +45,7 @@ helm repo update # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --create-namespace \ --namespace ingress-apisix \ diff --git a/docs/en/latest/deployments/openshift.md b/docs/en/latest/deployments/openshift.md index a660d6312c..1be1a282fc 100644 --- a/docs/en/latest/deployments/openshift.md +++ b/docs/en/latest/deployments/openshift.md @@ -56,7 +56,7 @@ helm repo update # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --set etcd.podSecurityContext.enabled=false \ --set etcd.containerSecurityContext.enabled=false \ diff --git a/docs/en/latest/deployments/tke.md b/docs/en/latest/deployments/tke.md index 428bf5b8c8..6c477856c6 100644 --- a/docs/en/latest/deployments/tke.md +++ b/docs/en/latest/deployments/tke.md @@ -111,7 +111,7 @@ You should now be able to use APISIX ingress controller. You can try running thi ### Enable SSL -SSL is disabled by default. You can enable it by adding the flag `--set gateway.tls.enabled=true`. +SSL is disabled by default. You can enable it by adding the flag `--set apisix.ssl.enabled=true`. ### Change default keys diff --git a/docs/en/latest/tutorials/configure-ingress-with-gateway-api.md b/docs/en/latest/tutorials/configure-ingress-with-gateway-api.md index 6c75948aab..16714722ce 100644 --- a/docs/en/latest/tutorials/configure-ingress-with-gateway-api.md +++ b/docs/en/latest/tutorials/configure-ingress-with-gateway-api.md @@ -55,7 +55,7 @@ helm repo add bitnami https://charts.bitnami.com/bitnami helm repo update kubectl create ns ingress-apisix helm install apisix apisix/apisix --namespace ingress-apisix \ ---set gateway.type=NodePort \ +--set service.type=NodePort \ --set ingress-controller.enabled=true \ --set ingress-controller.config.apisix.serviceNamespace=ingress-apisix \ --set ingress-controller.config.kubernetes.enableGatewayAPI=true diff --git a/docs/en/latest/tutorials/how-to-use-go-plugin-runner-in-apisix-ingress.md b/docs/en/latest/tutorials/how-to-use-go-plugin-runner-in-apisix-ingress.md index 5b8026031f..a4f2905bfe 100644 --- a/docs/en/latest/tutorials/how-to-use-go-plugin-runner-in-apisix-ingress.md +++ b/docs/en/latest/tutorials/how-to-use-go-plugin-runner-in-apisix-ingress.md @@ -132,7 +132,7 @@ Then install APISIX using helm with the following command in the directory of Ap # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set apisix.image.repository=custom/apisix \ --set apisix.image.tag=v0.1 \ --set extPlugin.enabled=true \ diff --git a/docs/en/latest/tutorials/istio-egress-gateway.md b/docs/en/latest/tutorials/istio-egress-gateway.md index 05bdbf7f95..b17a8c06b5 100644 --- a/docs/en/latest/tutorials/istio-egress-gateway.md +++ b/docs/en/latest/tutorials/istio-egress-gateway.md @@ -46,11 +46,11 @@ kubectl create ns ingress-apisix kubectl label ns ingress-apisix istio-injection=disabled helm install apisix apisix/apisix --create-namespace \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --namespace ingress-apisix \ --set ingress-controller.config.apisix.serviceNamespace=ingress-apisix \ - --set gateway.tls.enabled=true + --set apisix.ssl.enabled=true ``` ### Create Test Workload diff --git a/docs/en/latest/tutorials/manage-certificates-with-cert-manager.md b/docs/en/latest/tutorials/manage-certificates-with-cert-manager.md index 0552b82005..2812cffbfa 100644 --- a/docs/en/latest/tutorials/manage-certificates-with-cert-manager.md +++ b/docs/en/latest/tutorials/manage-certificates-with-cert-manager.md @@ -30,7 +30,7 @@ This tutorial will detail how to manage secrets of ApisixTls using cert-manager. * Install [apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller/blob/master/install.md). * Install [cert-manager](https://cert-manager.io/docs/installation/#default-static-install). -In this guide, we assume that your APISIX is installed with `ssl` enabled, which is not enabled by default in the Helm Chart. To enable it, you need to set `gateway.tls.enabled=true` during installation. +In this guide, we assume that your APISIX is installed with `ssl` enabled, which is not enabled by default in the Helm Chart. To enable it, you need to set `apisix.ssl.enabled=true` during installation. For example, you could install APISIX and APISIX ingress controller by running: @@ -38,9 +38,9 @@ For example, you could install APISIX and APISIX ingress controller by running: # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ - --set gateway.tls.enabled=true \ + --set apisix.ssl.enabled=true \ --set ingress-controller.config.apisix.serviceNamespace=default \ --set ingress-controller.config.apisix.adminAPIVersion=$ADMIN_API_VERSION ``` diff --git a/docs/en/latest/tutorials/manage-ingress-certificates-with-cert-manager.md b/docs/en/latest/tutorials/manage-ingress-certificates-with-cert-manager.md index a68e91fb63..1d36e99f0c 100644 --- a/docs/en/latest/tutorials/manage-ingress-certificates-with-cert-manager.md +++ b/docs/en/latest/tutorials/manage-ingress-certificates-with-cert-manager.md @@ -30,7 +30,7 @@ This tutorial will detail how to secure ingress using cert-manager. * Install [apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller/blob/master/install.md). * Install [cert-manager](https://cert-manager.io/docs/installation/#default-static-install). -In this guide, we assume that your APISIX is installed with `ssl` enabled, which is not enabled by default in the Helm Chart. To enable it, you need to set `gateway.tls.enabled=true` during installation. +In this guide, we assume that your APISIX is installed with `ssl` enabled, which is not enabled by default in the Helm Chart. To enable it, you need to set `apisix.ssl.enabled=true` during installation. For example, you could install APISIX and APISIX ingress controller by running: @@ -38,9 +38,9 @@ For example, you could install APISIX and APISIX ingress controller by running: # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ - --set gateway.tls.enabled=true \ + --set apisix.ssl.enabled=true \ --set ingress-controller.config.apisix.serviceNamespace=default \ --set ingress-controller.config.apisix.adminAPIVersion=$ADMIN_API_VERSION ``` diff --git a/docs/en/latest/tutorials/mtls.md b/docs/en/latest/tutorials/mtls.md index cf83ad72d4..56cac48074 100644 --- a/docs/en/latest/tutorials/mtls.md +++ b/docs/en/latest/tutorials/mtls.md @@ -30,7 +30,7 @@ To learn more about mTLS, please refer to [Mutual authentication](https://en.wik - an available Kubernetes cluster - an available APISIX and APISIX Ingress Controller installation -In this guide, we assume that your APISIX is installed in the `apisix` namespace and `ssl` is enabled, which is not enabled by default in the Helm Chart. To enable it, you need to set `gateway.tls.enabled=true` during installation. +In this guide, we assume that your APISIX is installed in the `apisix` namespace and `ssl` is enabled, which is not enabled by default in the Helm Chart. To enable it, you need to set `apisix.ssl.enabled=true` during installation. Assuming the SSL port is `9443`. diff --git a/docs/en/latest/tutorials/proxy-grpc-service.md b/docs/en/latest/tutorials/proxy-grpc-service.md index 93517c1019..8276632ec7 100644 --- a/docs/en/latest/tutorials/proxy-grpc-service.md +++ b/docs/en/latest/tutorials/proxy-grpc-service.md @@ -41,9 +41,9 @@ You could install APISIX and APISIX ingress controller by running: # We use Apisix 3.0 in this example. If you're using Apisix v2.x, please set to v2 ADMIN_API_VERSION=v3 helm install apisix apisix/apisix -n ingress-apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ - --set gateway.tls.enabled=true \ + --set apisix.ssl.enabled=true \ --set ingress-controller.config.apisix.serviceNamespace=ingress-apisix \ --set ingress-controller.config.apisix.adminAPIVersion=$ADMIN_API_VERSION ``` diff --git a/docs/en/latest/tutorials/using-custom-plugins.md b/docs/en/latest/tutorials/using-custom-plugins.md index fe03679dc2..05f4e39911 100644 --- a/docs/en/latest/tutorials/using-custom-plugins.md +++ b/docs/en/latest/tutorials/using-custom-plugins.md @@ -135,7 +135,7 @@ plugins: - custom-response ``` -Finally you can enable the Ingress controller and configure the gateway to be exposed to external traffic. For this, set `gateway.type=NodePort`, `ingress-controller.enabled=true`, and `ingress-controller.config.apisix.serviceNamespace=ingress-apisix` in your `values.yaml` file. +Finally you can enable the Ingress controller and configure the gateway to be exposed to external traffic. For this, set `service.type=NodePort`, `ingress-controller.enabled=true`, and `ingress-controller.config.apisix.serviceNamespace=ingress-apisix` in your `values.yaml` file. Now we can run `helm install` with this [updated values.yaml](https://raw.githubusercontent.com/navendu-pottekkat/apisix-in-kubernetes/master/custom-plugin/values.yaml) file: diff --git a/docs/en/latest/upgrade.md b/docs/en/latest/upgrade.md index 130b28d954..ae0863d845 100644 --- a/docs/en/latest/upgrade.md +++ b/docs/en/latest/upgrade.md @@ -79,7 +79,7 @@ Just as an example, the specific configuration needs to be modified by yourself. ```sh helm upgrade apisix apisix/apisix \ - --set gateway.type=NodePort \ + --set service.type=NodePort \ --set ingress-controller.enabled=true \ --namespace ingress-apisix \ --set ingress-controller.config.apisix.serviceNamespace=ingress-apisix