From 73498bd761e661989b7397eeb12bf18c57683abe Mon Sep 17 00:00:00 2001 From: Gallardot Date: Tue, 12 Jul 2022 15:58:45 +0800 Subject: [PATCH] docs: update crd version (#1134) --- .../latest/concepts/apisix_cluster_config.md | 4 +- docs/en/latest/concepts/apisix_route.md | 42 +++++++++---------- docs/en/latest/concepts/apisix_tls.md | 2 +- docs/en/latest/concepts/apisix_upstream.md | 12 +++--- docs/en/latest/tutorials/mtls/mtls.yaml | 2 +- docs/en/latest/tutorials/mtls/tls.yaml | 2 +- .../en/latest/tutorials/proxy-grpc-service.md | 4 +- .../tutorials/proxy-the-httpbin-service.md | 2 +- docs/en/latest/upgrade.md | 4 +- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/en/latest/concepts/apisix_cluster_config.md b/docs/en/latest/concepts/apisix_cluster_config.md index 1c98edbf88..74f7c643a7 100644 --- a/docs/en/latest/concepts/apisix_cluster_config.md +++ b/docs/en/latest/concepts/apisix_cluster_config.md @@ -35,7 +35,7 @@ if you'd like to learn the real running status of your cluster. In such a case, could create a `ApisixClusterConfig` to enable these features explicitly. ```yaml -apiVersion: apisix.apache.org/v2alpha1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixClusterConfig metadata: name: default @@ -58,7 +58,7 @@ The default APISIX cluster is configured through command line options like `--de of Deployment or Pod template. Now with the help of `ApisixClusterConfig`, you can change some administrative fields on it. ```yaml -apiVersion: apisix.apache.org/v2alpha1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixClusterConfig metadata: name: default diff --git a/docs/en/latest/concepts/apisix_route.md b/docs/en/latest/concepts/apisix_route.md index 94432b4208..6b627edeb1 100644 --- a/docs/en/latest/concepts/apisix_route.md +++ b/docs/en/latest/concepts/apisix_route.md @@ -48,15 +48,15 @@ spec: paths: - "/foo*" backends: - - serviceName: foo - servicePort: 80 + - serviceName: foo + servicePort: 80 - name: bar match: paths: - "/bar" backends: - - serviceName: bar - servicePort: 80 + - serviceName: bar + servicePort: 80 ``` There are two path types can be used, `prefix` and `exact`, default is `exact`, @@ -86,8 +86,8 @@ spec: methods: - GET backends: - - serviceName: foo - servicePort: 80 + - serviceName: foo + servicePort: 80 ``` The `exprs` allows user to configure match conditions with arbitrary predicates in HTTP, such as queries, HTTP headers, Cookie. @@ -111,8 +111,8 @@ spec: op: Equal value: "2143" backends: - - serviceName: foo - servicePort: 80 + - serviceName: foo + servicePort: 80 ``` The above configuration configures an extra route match condition, which asks the @@ -141,9 +141,9 @@ spec: methods: - GET backends: - - serviceName: foo - servicePort: 80 - resolveGranularity: service + - serviceName: foo + servicePort: 80 + resolveGranularity: service ``` Weight Based Traffic Split @@ -174,12 +174,12 @@ spec: op: RegexMatch value: ".*Chrome.*" backends: - - serviceName: foo - servicePort: 80 - weight: 100 - - serviceName: bar - servicePort: 81 - weight: 50 + - serviceName: foo + servicePort: 80 + weight: 100 + - serviceName: bar + servicePort: 81 + weight: 50 ``` The above `ApisixRoute` has one route rule, which contains two backends `foo` and `bar`, the weight ratio is `100:50`, @@ -206,8 +206,8 @@ spec: paths: - /* backends: - - serviceName: foo - servicePort: 80 + - serviceName: foo + servicePort: 80 plugins: - name: cors enable: true @@ -236,8 +236,8 @@ spec: paths: - /* backends: - - serviceName: websocket-server - servicePort: 8080 + - serviceName: websocket-server + servicePort: 8080 websocket: true ``` diff --git a/docs/en/latest/concepts/apisix_tls.md b/docs/en/latest/concepts/apisix_tls.md index 0c172b7476..71a97ca7d9 100644 --- a/docs/en/latest/concepts/apisix_tls.md +++ b/docs/en/latest/concepts/apisix_tls.md @@ -27,7 +27,7 @@ Secret must have two keys `cert` and `key`, which used to store the certificate PEM format respectively. ```shell -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixTls metadata: name: sample-tls diff --git a/docs/en/latest/concepts/apisix_upstream.md b/docs/en/latest/concepts/apisix_upstream.md index 575248c229..a0e906c7f4 100644 --- a/docs/en/latest/concepts/apisix_upstream.md +++ b/docs/en/latest/concepts/apisix_upstream.md @@ -32,7 +32,7 @@ To learn more, please check the [Apache APISIX architecture-design docs](https:/ A proper load balancing algorithm is required to scatter requests reasonably for a Kubernetes Service. ```yaml -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixUpstream metadata: name: httpbin @@ -58,7 +58,7 @@ The above example shows that [ewma](https://linkerd.io/2016/03/16/beyond-round-r Sometimes the session sticky is desired, and you can use the [Consistent Hashing](https://en.wikipedia.org/wiki/Consistent_hashing) load balancing algorithm. ```yaml -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixUpstream metadata: name: httpbin @@ -77,7 +77,7 @@ Although Kubelet already provides [probes](https://kubernetes.io/docs/tasks/conf like the passive feedback capability. ```yaml -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixUpstream metadata: name: httpbin @@ -128,7 +128,7 @@ if nothing has been sent to a client yet. That is, if an error or timeout occurs of the transferring of a response, fixing this is impossible. ```yaml -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixUpstream metadata: name: httpbin @@ -140,7 +140,7 @@ The default connect, read and send timeout are `60s`, which might not proper for just change them in the `timeout` field. ```yaml -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixUpstream metadata: name: httpbin @@ -159,7 +159,7 @@ Once in a while a single Kubernetes Service might expose multiple ports which pr In that case, you can create configurations for individual port. ```yaml -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixUpstream metadata: name: foo diff --git a/docs/en/latest/tutorials/mtls/mtls.yaml b/docs/en/latest/tutorials/mtls/mtls.yaml index da88150a43..20a6fa6666 100644 --- a/docs/en/latest/tutorials/mtls/mtls.yaml +++ b/docs/en/latest/tutorials/mtls/mtls.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixTls metadata: name: sample-tls diff --git a/docs/en/latest/tutorials/mtls/tls.yaml b/docs/en/latest/tutorials/mtls/tls.yaml index bda748a11e..cfea8f384a 100644 --- a/docs/en/latest/tutorials/mtls/tls.yaml +++ b/docs/en/latest/tutorials/mtls/tls.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: apisix.apache.org/v1 +apiVersion: apisix.apache.org/v2beta3 kind: ApisixTls metadata: name: sample-tls diff --git a/docs/en/latest/tutorials/proxy-grpc-service.md b/docs/en/latest/tutorials/proxy-grpc-service.md index 33dc96a262..b717448999 100644 --- a/docs/en/latest/tutorials/proxy-grpc-service.md +++ b/docs/en/latest/tutorials/proxy-grpc-service.md @@ -106,7 +106,7 @@ EOF ```bash kubectl apply -f - <