Moved useHttp1 to root and renamed to useHttp11

Author: damianr13

README.md

@@ -364,7 +364,8 @@ This field contains Restate-specific configuration.
 |---|---|---|
 | `register` | `object` | **Required**. The location of the Restate Admin API to register this deployment against. See details below. |
 | `servicePath` | `string` | Optional path to append to the Service url when registering with Restate. |
-| `options` | `object` | Optional configuration options for service registration. See details below. |
+| `useHttp11`  | `boolean` | Force the use of HTTP/1.1 when registering with Restate. Defaults to HTTP/2 if not specified. |
+
 
 The `register` field must specify exactly one of `cluster`, `service`, or `url`.
 
@@ -383,12 +384,6 @@ The `register` field must specify exactly one of `cluster`, `service`, or `url`.
 | `path` | `string` | An optional URL path to be prepended to admin API paths. Should not end with a `/`. |
 | `port` | `integer` | The port on the service that hosts the admin API. Defaults to 9070. |
 
-**`options` Fields**
-
-| Field       | Type      | Description                                                                         |
-| ----------- | --------- | ----------------------------------------------------------------------------------- |
-| `useHttp1`  | `boolean` | Force the use of HTTP/1.1 when registering with Restate. Defaults to HTTP/2 if not specified. |
-
 ### EKS Pod Identity
 
 [EKS Pod Identity](https://docs.aws.amazon.com/eks/latest/userguide/pod-identities.html) is a convenient way to have a

crd/RestateDeployment.pkl

@@ -62,14 +62,8 @@ class Restate {
   /// service will be registered at the root path "/".
   servicePath: String?
 
-  /// Optional configuration options for service registration
-  options: Options?
-}
-
-/// Optional configuration options for service registration
-class Options {
   /// Force the use of HTTP/1.1 when registering with Restate
-  useHttp1: Boolean?
+  useHttp11: Boolean?
 }
 
 /// The location of the Restate Admin API to register this deployment against

crd/restatedeployments.yaml

@@ -108,15 +108,10 @@ spec:
                     description: Optional path to append to the Service url when registering with Restate. If not provided, the service will be registered at the root path "/".
                     nullable: true
                     type: string
-                  options:
-                    description: Optional configuration options for service registration
+                  useHttp11:
+                    description: Force the use of HTTP/1.1 when registering with Restate
                     nullable: true
-                    properties:
-                      useHttp1:
-                        description: Force the use of HTTP/1.1 when registering with Restate
-                        nullable: true
-                        type: boolean
-                    type: object
+                    type: boolean
                 required:
                 - register
                 type: object

src/controllers/restatedeployment/controller.rs

@@ -33,7 +33,7 @@ use crate::controllers::{service_url, Diagnostics, State};
 use crate::metrics::Metrics;
 use crate::resources::restateclusters::RestateCluster;
 use crate::resources::restatedeployments::{
-    RestateDeployment, RestateDeploymentCondition, RestateDeploymentStatus, RestateOptions,
+    RestateDeployment, RestateDeploymentCondition, RestateDeploymentStatus,
     RESTATE_DEPLOYMENT_FINALIZER,
 };
 use crate::telemetry;
@@ -313,7 +313,7 @@ impl RestateDeployment {
                 &ctx.http_client,
                 &admin_endpoint,
                 &service_endpoint,
-                self.spec.restate.options.as_ref().cloned(),
+                self.spec.restate.use_http11.as_ref().cloned(),
             )
             .await?;
             // if registration succeeded, treat this as an active endpoint
@@ -493,7 +493,7 @@ impl RestateDeployment {
         client: &reqwest::Client,
         admin_endpoint: &Url,
         service_endpoint: &Url,
-        options: Option<RestateOptions>,
+        use_http11: Option<bool>,
     ) -> Result<String> {
         debug!("Registering endpoint '{service_endpoint}' to Restate at '{admin_endpoint}'",);
 
@@ -506,8 +506,8 @@ impl RestateDeployment {
             "uri": service_endpoint,
         });
 
-        if let Some(options) = options {
-            payload["use_http_11"] = serde_json::Value::Bool(options.use_http1.unwrap_or(false));
+        if let Some(use_http11) = use_http11 {
+            payload["use_http_11"] = serde_json::Value::Bool(use_http11);
         }
 
         let resp: DeploymentResponse = client

src/controllers/restatedeployment/reconcilers/replicaset.rs

@@ -120,11 +120,9 @@ pub fn generate_pod_template_hash(rsd: &RestateDeployment, pod_template: &str) -
         hasher.write(service_path.as_bytes());
     }
 
-    // if you change the HTTP version option, it creates a new deployment, which means we want a new replicaset too to keep things 1:1
-    if let Some(options) = &rsd.spec.restate.options {
-        if let Some(use_http1) = options.use_http1 {
-            hasher.write(&[if use_http1 { 1 } else { 0 }]);
-        }
+    // It's possible that changing this flag will create a new deployment id; by making it part of the replicaset name we guarantee that deployments and replicasets stay 1:1
+    if let Some(use_http11) = rsd.spec.restate.use_http11 {
+        hasher.write(&[if use_http11 { 1 } else { 0 }]);
     }
 
     if let Some(collision_count) = rsd.status.as_ref().and_then(|s| s.collision_count) {

src/resources/restatedeployments.rs

@@ -152,18 +152,9 @@ pub struct RestateSpec {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub service_path: Option<String>,
 
-    /// Optional configuration options for service registration
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<RestateOptions>,
-}
-
-/// Optional configuration options for service registration
-#[derive(Deserialize, Serialize, Clone, Debug, JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct RestateOptions {
     /// Force the use of HTTP/1.1 when registering with Restate
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub use_http1: Option<bool>,
+    pub use_http11: Option<bool>,
 }
 
 /// The location of the Restate Admin API to register this deployment against