Merge branch 'main' into add-readiness-liveness-probe

changelog/v1.18.0-beta35/deprecate-graphql.yaml

@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/solo-projects/issues/7159
+    resolvesIssue: false
+    description: >-
+      The GraphQL feature of Gloo Gateway is deprecated and will be removed in a future release

docs/content/guides/graphql/_index.md

@@ -6,6 +6,9 @@ description: Enable GraphQL resolution.
 
 Set up API gateway and GraphQL server functionality for your apps in the same process by using Gloo Gateway.
 
+{{% notice warning %}}
+This feature is deprecated in Gloo Gateway 1.18 and will be removed in a future release
+{{% /notice %}}
 {{% notice note %}}
 This feature is available only in Gloo Gateway Enterprise.
 {{% /notice %}}

projects/gateway/api/v1/virtual_service.proto

@@ -223,7 +223,7 @@ message Route {
         // Delegate routing actions for the given matcher to one or more RouteTables.
         DelegateAction delegate_action = 5;
 
-        // Enterprise-Only: THIS FEATURE IS IN TECH PREVIEW. APIs are versioned as alpha and subject to change.
+        // Deprecated, Enterprise-Only: THIS FEATURE WILL BE REMOVED IN A FUTURE RELEASE. APIs are versioned as alpha and subject to change.
         // A reference to a GraphQLApi CR. Resolution of the client request to upstream(s) will be delegated to
         // the resolution policies defined in the GraphQLApi CR. If configured, the graphql filter will operate
         // instead of the envoy router filter, so configuration (such as retries) that applies to the router filter

projects/gloo/api/v1/enterprise/options/graphql/v1beta1/graphql.proto

@@ -47,6 +47,7 @@ import "google/protobuf/wrappers.proto";
       - use `a[*][1]` to create a list of all values from object "a"
  */
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 // Defines a configuration for generating outgoing requests for a resolver.
 message RequestTemplate {
   // Use this attribute to set request headers to your REST service. It consists of a
@@ -77,6 +78,7 @@ message RequestTemplate {
   google.protobuf.Value body = 3;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 message ResponseTemplate {
   /*
     Sets the "root" of the upstream response to be turned into a graphql type by the graphql server.
@@ -120,6 +122,7 @@ message ResponseTemplate {
   map<string, string> setters = 2;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 // Defines a configuration for generating outgoing requests for a resolver.
 message GrpcRequestTemplate {
   // json representation of outgoing gRPC message to be sent to gRPC service
@@ -138,6 +141,7 @@ message GrpcRequestTemplate {
   map<string, string> request_metadata = 4;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 // control-plane API
 message RESTResolver {
   core.solo.io.ResourceRef upstream_ref = 1;
@@ -153,6 +157,7 @@ message RESTResolver {
   google.protobuf.Duration timeout = 5;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 // Defines a configuration for serializing and deserializing requests for a gRPC resolver.
 // Is a Schema Extension
 message GrpcDescriptorRegistry {
@@ -199,6 +204,7 @@ message GrpcResolver {
   google.protobuf.Duration timeout = 5;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 message StitchedSchema {
 
   message SubschemaConfig {
@@ -286,6 +292,7 @@ message StitchedSchema {
   repeated SubschemaConfig subschemas = 1;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 message MockResolver {
   message AsyncResponse {
     // The response from the resolver as a JSON.
@@ -305,6 +312,7 @@ message MockResolver {
   }
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 // Define a named resolver which can be then matched to a field using the `resolve` directive.
 // if a field does not have resolver, the default resolver will be used.
 // the default resolver takes the field with the same name from the parent, and uses that value
@@ -331,7 +339,7 @@ message Resolution {
   google.protobuf.StringValue stat_prefix = 3;
 }
 
-// Enterprise-Only: THIS FEATURE IS IN TECH PREVIEW. APIs are versioned as alpha and subject to change.
+// Deprecated, Enterprise-Only: THIS FEATURE IS DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE. APIs are versioned as alpha and subject to change.
 // User-facing CR config for resolving client requests to graphql schemas.
 // Routes that have this config will execute graphql queries, and will not make it to the router filter. i.e. this
 // filter will terminate the request for these routes.
@@ -381,12 +389,14 @@ message GraphQLApi {
   GraphQLApiOptions options = 8;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 // This message specifies Persisted Query Cache configuration.
 message PersistedQueryCacheConfig {
   // The unit is number of queries to store, default to 1000.
   uint32 cache_size = 1;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 message ExecutableSchema {
   // Schema to use in string format.
 
@@ -420,6 +430,7 @@ message ExecutableSchema {
   GrpcDescriptorRegistry grpc_descriptor_registry = 3;
 }
 
+// Deprecated: The GraphQL feature of Gloo Gateway will be removed in a future release.
 message Executor {
   // Execute schema using resolvers.
   message Local {