Skip to content

Commit

Permalink
Sync Gloo Mesh APIs. Destination Branch: gloo-mesh-v2.4.x (#1137)
Browse files Browse the repository at this point in the history
Co-authored-by: soloio-bot <[email protected]>
  • Loading branch information
soloio-bot and soloio-bot authored Mar 1, 2024
1 parent 1523aed commit f729887
Show file tree
Hide file tree
Showing 12 changed files with 652 additions and 590 deletions.
222 changes: 125 additions & 97 deletions api/gloo.solo.io/admin/v2/dashboard.proto

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions api/gloo.solo.io/admin/v2/gateway_lifecycle_manager.proto
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// **Examples**:
//
// **East-west** (Gloo Mesh license): This example creates an east-west gateway named `istio-eastwestgateway` in the `gloo-mesh-gateways`
// namespace of two workload clusters (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the Solo Istio revision (`$REVISION`),
// namespace of two workload clusters (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the revision for the Solo distribution of Istio (`$REVISION`),
// image tag (`$ISTIO_IMAGE`), and repo key (`$REPO`).
// ```yaml
// apiVersion: admin.gloo.solo.io/v2
Expand All @@ -31,7 +31,7 @@
// istioOperatorSpec:
// # No control plane components are installed
// profile: empty
// # Solo.io Istio distribution repository; required for Solo Istio.
// # Repository for the Solo distribution of Istio; required to use Solo images.
// # You get the repo key from your Solo Account Representative.
// hub: $REPO
// # The Solo.io Gloo Istio version
Expand Down Expand Up @@ -76,7 +76,7 @@
// ```
//
// **Ingress** (Gloo Gateway license): This example creates an ingress gateway named `istio-ingressgateway` in the `gloo-mesh-gateways`
// namespace of two workload clusters (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the Solo Istio revision (`$REVISION`),
// namespace of two workload clusters (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the revision for the Solo distribution of Istio (`$REVISION`),
// image tag (`$ISTIO_IMAGE`), and repo key (`$REPO`).
// ```yaml
// apiVersion: admin.gloo.solo.io/v2
Expand All @@ -98,10 +98,10 @@
// istioOperatorSpec:
// # No control plane components are installed
// profile: empty
// # Solo.io Istio distribution repository; required for Solo Istio.
// # Repository for the Solo distribution of Istio; required to use Solo images.
// # You get the repo key from your Solo Account Representative.
// hub: $REPO
// # The Solo.io Istio version tag
// # Tag for the Solo distribution of Istio
// tag: $ISTIO_IMAGE
// components:
// ingressGateways:
Expand Down Expand Up @@ -141,7 +141,7 @@
// ```
//
// **Egress**: This example creates an egress gateway named `istio-egressgateway` in the `gloo-mesh-gateways` namespace of two workload clusters,
// (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the Solo Istio revision (`$REVISION`), image tag (`$ISTIO_IMAGE`), and repo key (`$REPO`).
// (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the revision for the Solo distribution of Istio (`$REVISION`), image tag (`$ISTIO_IMAGE`), and repo key (`$REPO`).
// For more information, see the
// [Block egress traffic with an egress gateway]({{% versioned_link_path fromRoot="/routing/forward-requests/external-service/egress-gateway/" %}}) guide.
// ```yaml
Expand All @@ -164,7 +164,7 @@
// istioOperatorSpec:
// # No control plane components are installed
// profile: minimal
// # Solo.io Istio distribution repository; required for Gloo Istio.
// # Repository for the Solo distribution of Istio; required to use Solo images.
// # You get the repo key from your Solo Account Representative.
// hub: $REPO
// # The Solo.io Gloo Istio version
Expand Down Expand Up @@ -295,7 +295,7 @@ message GatewayInstallation {
string control_plane_revision = 1;

// Istio revision for this gateway installation, such as '1-18-2'.
// When set to `auto`, Gloo installs the gateway with the default supported version of Solo Istio.
// When set to `auto`, Gloo installs the gateway with the default supported Solo distribution of Istio.
string gateway_revision = 2;

// Clusters to install the Istio gateways in.
Expand Down
8 changes: 4 additions & 4 deletions api/gloo.solo.io/admin/v2/istio_lifecycle_manager.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// For more information, see the [Install Istio by using the Istio Lifecycle Manager]({{% versioned_link_path fromRoot="/setup/install/gloo_mesh_managed/" %}}) guide.
//
// **Example**: This example creates an `istiod` control plane in the `istio-system` namespace of two workload clusters
// (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the Solo Istio revision (`$REVISION`), image tag (`$ISTIO_IMAGE`),
// (`$REMOTE_CLUSTER1` and `$REMOTE_CLUSTER2`). You supply the revision for the Solo distribution of Istio (`$REVISION`), image tag (`$ISTIO_IMAGE`),
// and repo key (`$REPO`).
// ```yaml
// apiVersion: admin.gloo.solo.io/v2
Expand All @@ -30,10 +30,10 @@
// # Only the control plane components are installed
// # (https://istio.io/latest/docs/setup/additional-setup/config-profiles/)
// profile: minimal
// # Solo.io Istio distribution repository; required for Solo Istio.
// # Repository for the Solo distribution of Istio; required to use Solo images.
// # You get the repo key from your Solo Account Representative.
// hub: $REPO
// # Any Solo Istio tag
// # Tag for Solo distribution of Istio
// tag: $ISTIO_IMAGE
// namespace: istio-system
// # Mesh configuration
Expand Down Expand Up @@ -166,7 +166,7 @@ message IstioController {
message IstioInstallation {
// Istio revision for this installation, such as '1-18-2'.
// Label workload resources with 'istio.io/rev=$REVISION' to use this installation.
// When set to `auto`, Gloo installs the control plane with the default supported version of Solo Istio.
// When set to `auto`, Gloo installs the control plane with the default supported Solo distribution of Istio.
string revision = 1;

// Clusters to install the Istio control planes in.
Expand Down
11 changes: 9 additions & 2 deletions api/gloo.solo.io/admin/v2/workspace_settings.proto
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ message WorkspaceSettingsSpec {
message TypedObjectSelector {
// The type of the resource to import or export.
// The type must be a valid importable/exportable Kubernetes or Gloo Mesh resource type.
// Supported types: `RouteTable`, `Service`, `VirtualDestination`, `ExternalService`, `ApiDoc`, `GraphQLResolverMap`, `GraphQLSchema`, `GraphQLStitchedSchema`, `All` (all types).
// Supported types: `ROUTE_TABLE`, `SERVICE`, `VIRTUAL_DESTINATION`, `EXTERNAL_SERVICE`, `API_DOC`, `GRAPHQL_RESOLVER_MAP`, `GRAPHQL_SCHEMA`, `GRAPHQL_STITCHED_SCHEMA`, `EXTERNAL_WORKLOAD`, `ALL` (all types).
ObjectKind kind = 1;

// labels matching those of the object
Expand Down Expand Up @@ -206,7 +206,14 @@ message WorkspaceSettingsSpec {
// Select ExternalService objects.
EXTERNAL_SERVICE = 4;

// Select ApiDoc objects.
// Select ApiDoc objects. Please note that explicit import/export
// is only necessary for GraphQL ApiDocs that are referenced in
// graphql routes. ApiDocs that are used only in the context of the
// portal features (currently only OpenAPI ones) are implicitly
// imported/exported together with their corresponding destination,
// i.e. if a destination (e.g. a service) is visible to a RouteTable,
// the ApiDoc associated with it will be available when the RouteTable
// is referenced in a Portal.
API_DOC = 5;

// Select GraphQLResolverMap objects.
Expand Down
2 changes: 1 addition & 1 deletion api/gloo.solo.io/common/v2/selectors.proto
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ message ClusterSelector {
// Optional: Read Gloo configuration from specific clusters and namespaces that are included
// in a workspace. If you omit this field for any cluster in a workspace, it is set to `true`
// by default, and Gloo configuration is read for all clusters and namespaces in that workspace.
// If you explicitly set this field to either true or false on a specific cluster, you must also explicitly set
// If you explicitly set this field to either true or false on a specific cluster, you must also explicitly set
// the field for every other cluster that is listed in that workspace. For example, if you have a workspace that spans
// namespaces in three clusters, but you want to read Gloo configuration from the namespaces in only one of the
// clusters, you must explicitly set `configEnabled: true` for the cluster to read from,
Expand Down
Loading

0 comments on commit f729887

Please sign in to comment.