Skip to content

Commit

Permalink
docs: update crd version (#1134)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gallardot committed Jul 12, 2022
1 parent a649751 commit 73498bd
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions docs/en/latest/concepts/apisix_cluster_config.md
Expand Up @@ -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
Expand All @@ -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
Expand Down
42 changes: 21 additions & 21 deletions docs/en/latest/concepts/apisix_route.md
Expand Up @@ -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`,
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -141,9 +141,9 @@ spec:
methods:
- GET
backends:
- serviceName: foo
servicePort: 80
resolveGranularity: service
- serviceName: foo
servicePort: 80
resolveGranularity: service
```

Weight Based Traffic Split
Expand Down Expand Up @@ -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`,
Expand All @@ -206,8 +206,8 @@ spec:
paths:
- /*
backends:
- serviceName: foo
servicePort: 80
- serviceName: foo
servicePort: 80
plugins:
- name: cors
enable: true
Expand Down Expand Up @@ -236,8 +236,8 @@ spec:
paths:
- /*
backends:
- serviceName: websocket-server
servicePort: 8080
- serviceName: websocket-server
servicePort: 8080
websocket: true
```

Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/concepts/apisix_tls.md
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions docs/en/latest/concepts/apisix_upstream.md
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/tutorials/mtls/mtls.yaml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/tutorials/mtls/tls.yaml
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/en/latest/tutorials/proxy-grpc-service.md
Expand Up @@ -106,7 +106,7 @@ EOF
```bash
kubectl apply -f - <<EOF
apiVersion: apisix.apache.org/v1
apiVersion: apisix.apache.org/v2beta3
kind: ApisixUpstream
metadata:
name: yages
Expand Down Expand Up @@ -134,7 +134,7 @@ Inform APISIX SSL configuration through ApisixTls.
```bash
kubectl apply -f - <<EOF
apiVersion: apisix.apache.org/v1
apiVersion: apisix.apache.org/v2beta3
kind: ApisixTls
metadata:
name: grpc-secret
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/tutorials/proxy-the-httpbin-service.md
Expand Up @@ -46,7 +46,7 @@ In order to let Apache APISIX proxies requests to httpbin, we need to create an

```yaml
# httpbin-route.yaml
apiVersion: apisix.apache.org/v2beta2
apiVersion: apisix.apache.org/v2beta3
kind: ApisixRoute
metadata:
name: httpserver-route
Expand Down
4 changes: 2 additions & 2 deletions docs/en/latest/upgrade.md
Expand Up @@ -51,8 +51,8 @@ spec:
name: X-Foo
op: Equal
value: bar
backend:
serviceName: httpbin
backends:
- serviceName: httpbin
servicePort: 80
```

Expand Down

0 comments on commit 73498bd

Please sign in to comment.