Skip to content

Commit

Permalink
Automated merge
Browse files Browse the repository at this point in the history
* upstream/main:
  Fix the command to display the make targets (#151)
  Remove the redundant step while creating the Istio resource. (#149)
  Add gateway instructions to user docs (#146)
  • Loading branch information
openshift-service-mesh-bot committed May 31, 2024
2 parents 203ac87 + 126638d commit a9c87bd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ If you are editing the API definitions, generate the manifests such as CRs or CR
make manifests
```

**NOTE:** Run `make --help` for more information on all potential `make` targets
**NOTE:** Run `make help` for more information on all potential `make` targets

More information can be found via the [Kubebuilder Documentation](https://book.kubebuilder.io/introduction.html)

Expand Down
3 changes: 1 addition & 2 deletions bundle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@ Repeat the process to create a project named `istio-cni`.
### Creating the Istio resource

1. In the OpenShift Container Platform web console, click **Operators** -> **Installed Operators**.
1. Select `istio-system` in the **Project** drop-down menu.
1. Select the `istio-system` project from the **Namespace** drop-down menu.
1. Click the sail-operator.
1. Click **Istio**.
1. Click **Create Istio**.
1. Select the `istio-system` project from the **Namespace** drop-down menu.
1. Click **Create**. This action deploys the Istio control plane.
1. When `State: Healthy` appears in the `Status` column, Istio is successfully deployed.

Expand Down
5 changes: 4 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ tbd
tbd

## Gateways
tbd

The Sail-operator does not manage Gateways. You can deploy a gateway manually either through [gateway-api](https://istio.io/latest/docs/tasks/traffic-management/ingress/gateway-api/) or through [gateway injection](https://istio.io/latest/docs/setup/additional-setup/gateway/#deploying-a-gateway). As you are following the gateway installation instructions, skip the step to install Istio since this is handled by the Sail-operator.

**Note:** The `IstioOperator` / `istioctl` example is separate from the Sail-operator. Setting `spec.components` or `spec.values.gateways` on your Sail-operator `Istio` resource **will not work**.

## Multicluster
tbd
Expand Down

0 comments on commit a9c87bd

Please sign in to comment.