Merge pull request #12475 from sbueringer/pr-minimum-timeout

⚠️ Change ExtensionConfig handler timeoutSeconds from *int32 to int32 & add Minimum=1

Author: k8s-ci-robot

api/runtime/v1alpha1/conversion.go

@@ -40,6 +40,12 @@ func (dst *ExtensionConfig) ConvertFrom(srcRaw conversion.Hub) error {
 	}
 
 	dropEmptyStringsExtensionConfig(dst)
+	for i, h := range dst.Status.Handlers {
+		if h.TimeoutSeconds != nil && *h.TimeoutSeconds == 0 {
+			h.TimeoutSeconds = nil
+		}
+		dst.Status.Handlers[i] = h
+	}
 	return nil
 }
 

api/runtime/v1alpha1/zz_generated.conversion.go

@@ -172,9 +172,10 @@ type ExtensionHandler struct {
 	RequestHook GroupVersionHook `json:"requestHook"`
 
 	// timeoutSeconds defines the timeout duration for client calls to the ExtensionHandler.
-	// Defaults to 10 is not set.
+	// Defaults to 10 if not set.
 	// +optional
-	TimeoutSeconds *int32 `json:"timeoutSeconds,omitempty"`
+	// +kubebuilder:validation:Minimum=1
+	TimeoutSeconds int32 `json:"timeoutSeconds,omitempty"`
 
 	// failurePolicy defines how failures in calls to the ExtensionHandler should be handled by a client.
 	// Defaults to Fail if not set.

api/runtime/v1beta2/extensionconfig_types.go

@@ -141,7 +141,7 @@ func (c *client) Discover(ctx context.Context, extensionConfig *runtimev1.Extens
 					APIVersion: handler.RequestHook.APIVersion,
 					Hook:       handler.RequestHook.Hook,
 				},
-				TimeoutSeconds: handler.TimeoutSeconds,
+				TimeoutSeconds: ptr.Deref(handler.TimeoutSeconds, 0),
 				FailurePolicy:  runtimev1.FailurePolicy(ptr.Deref(handler.FailurePolicy, "")),
 			},
 		)
@@ -305,8 +305,8 @@ func (c *client) CallExtension(ctx context.Context, hook runtimecatalog.Hook, fo
 
 	log.V(4).Info(fmt.Sprintf("Calling extension handler %q", name))
 	timeoutDuration := runtimehooksv1.DefaultHandlersTimeoutSeconds * time.Second
-	if registration.TimeoutSeconds != nil {
-		timeoutDuration = time.Duration(*registration.TimeoutSeconds) * time.Second
+	if registration.TimeoutSeconds != 0 {
+		timeoutDuration = time.Duration(registration.TimeoutSeconds) * time.Second
 	}
 
 	// Prepare the request by merging the settings in the registration with the settings in the request.

api/runtime/v1beta2/zz_generated.deepcopy.go

@@ -562,7 +562,7 @@ func TestClient_CallExtension(t *testing.T) {
 						APIVersion: fakev1alpha1.GroupVersion.String(),
 						Hook:       "FakeHook",
 					},
-					TimeoutSeconds: ptr.To[int32](1),
+					TimeoutSeconds: 1,
 					FailurePolicy:  runtimev1.FailurePolicyFail,
 				},
 			},
@@ -587,7 +587,7 @@ func TestClient_CallExtension(t *testing.T) {
 						APIVersion: fakev1alpha1.GroupVersion.String(),
 						Hook:       "FakeHook",
 					},
-					TimeoutSeconds: ptr.To[int32](1),
+					TimeoutSeconds: 1,
 					FailurePolicy:  runtimev1.FailurePolicyIgnore,
 				},
 			},
@@ -956,7 +956,7 @@ func TestClient_CallAllExtensions(t *testing.T) {
 						APIVersion: fakev1alpha1.GroupVersion.String(),
 						Hook:       "FakeHook",
 					},
-					TimeoutSeconds: ptr.To[int32](1),
+					TimeoutSeconds: 1,
 					FailurePolicy:  runtimev1.FailurePolicyFail,
 				},
 				{
@@ -965,7 +965,7 @@ func TestClient_CallAllExtensions(t *testing.T) {
 						APIVersion: fakev1alpha1.GroupVersion.String(),
 						Hook:       "FakeHook",
 					},
-					TimeoutSeconds: ptr.To[int32](1),
+					TimeoutSeconds: 1,
 					FailurePolicy:  runtimev1.FailurePolicyFail,
 				},
 				{
@@ -974,7 +974,7 @@ func TestClient_CallAllExtensions(t *testing.T) {
 						APIVersion: fakev1alpha1.GroupVersion.String(),
 						Hook:       "FakeHook",
 					},
-					TimeoutSeconds: ptr.To[int32](1),
+					TimeoutSeconds: 1,
 					FailurePolicy:  runtimev1.FailurePolicyFail,
 				},
 			},

config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml

@@ -77,7 +77,7 @@ type ExtensionRegistration struct {
 	ClientConfig runtimev1.ClientConfig
 
 	// TimeoutSeconds is the timeout duration used for calls to the RuntimeExtension.
-	TimeoutSeconds *int32
+	TimeoutSeconds int32
 
 	// FailurePolicy defines how failures in calls to the RuntimeExtension should be handled by a client.
 	FailurePolicy runtimev1.FailurePolicy