Move istio gateway's override setting into spec.ingress.istio (#3270)

Since c45584402f,
Ingress configuration is moved in `spec.ingress.istio`.

Hence this patch updates the docs to use
`spec.ingres.istio.knative-ingress-gateway` and `spec.ingres.istio.knative-local-gateway`.
This commit is contained in:
Kenjiro Nakayama 2021-02-27 11:43:47 +09:00 committed by GitHub
parent 74c867bbf5
commit 16b0013632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 16 deletions

View File

@ -272,7 +272,7 @@ To set up custom ingress gateway, follow [**Step 1: Create Gateway Service and D
### Step 2: Update the Knative gateway ### Step 2: Update the Knative gateway
Update `spec.knative-ingress-gateway` to select the labels of the new ingress gateway: Update `spec.ingress.istio.knative-ingress-gateway` to select the labels of the new ingress gateway:
``` ```
apiVersion: operator.knative.dev/v1alpha1 apiVersion: operator.knative.dev/v1alpha1
@ -281,6 +281,9 @@ metadata:
name: knative-serving name: knative-serving
namespace: knative-serving namespace: knative-serving
spec: spec:
ingress:
istio:
enabled: true
knative-ingress-gateway: knative-ingress-gateway:
selector: selector:
custom: ingressgateway custom: ingressgateway
@ -297,6 +300,9 @@ metadata:
name: knative-serving name: knative-serving
namespace: knative-serving namespace: knative-serving
spec: spec:
ingress:
istio:
enabled: true
knative-ingress-gateway: knative-ingress-gateway:
selector: selector:
custom: ingressgateway custom: ingressgateway
@ -309,19 +315,19 @@ The key in `spec.config.istio` is in the format of `gateway.{{gateway_namespace}
## Configuration of cluster local gateway ## Configuration of cluster local gateway
Update `spec.cluster-local-gateway` to select the labels of the new cluster-local ingress gateway: Update `spec.ingress.istio.knative-local-gateway` to select the labels of the new cluster-local ingress gateway:
### Default local gateway name: ### Default local gateway name:
Go through the guide [here](./../installing-istio.md/#installing-istio-without-sidecar-injection) to use local cluster gateway, Go through the guide [here](./../installing-istio.md/#installing-istio-without-sidecar-injection) to use local cluster gateway,
if you use the default gateway called `cluster-local-gateway`. if you use the default gateway called `knative-local-gateway`.
### Non-default local gateway name: ### Non-default local gateway name:
If you create custom local gateway with a name other than `cluster-local-gateway`, update `config.istio` and the If you create custom local gateway with a name other than `knative-local-gateway`, update `config.istio` and the
`cluster-local-gateway` selector: `knative-local-gateway` selector:
This example shows a service and deployment `custom-local-gateway` in the namespace `istio-system`, with the This example shows a service and deployment `knative-local-gateway` in the namespace `istio-system`, with the
label `custom: custom-local-gw`: label `custom: custom-local-gw`:
``` ```
@ -331,12 +337,15 @@ metadata:
name: knative-serving name: knative-serving
namespace: knative-serving namespace: knative-serving
spec: spec:
cluster-local-gateway: ingress:
istio:
enabled: true
knative-local-gateway:
selector: selector:
custom: custom-local-gateway custom: custom-local-gateway
config: config:
istio: istio:
local-gateway.knative-serving.cluster-local-gateway: "custom-local-gateway.istio-system.svc.cluster.local" local-gateway.knative-serving.knative-local-gateway: "custom-local-gateway.istio-system.svc.cluster.local"
``` ```
## High availability ## High availability