feat: Use unstructured.Unstructured for search result resources, update OpenAPI definitions, and streamline deployment restarts.

Author: JoseSzycho

Taskfile.yaml

@@ -651,17 +651,10 @@ tasks:
         echo "Redeploying Search's apiserver..."
 
         echo "Redeploying Search controller manager..."
-
-        # Restart the deployment to pick up new image
-        task test-infra:kubectl -- rollout restart deployment/search-apiserver -n search-system
-        task test-infra:kubectl -- rollout restart deployment/search-controller-manager -n search-system
-        task test-infra:kubectl -- rollout restart deployment/resource-indexer -n search-system
-
-        # Wait for rollout to complete
-        echo "Waiting for rollout to complete..."
-        task test-infra:kubectl -- rollout status deployment/search-apiserver -n search-system --timeout=1000s
-        task test-infra:kubectl -- rollout status deployment/search-controller-manager -n search-system --timeout=1000s
-        task test-infra:kubectl -- rollout status deployment/resource-indexer -n search-system --timeout=1000s
+        
+        task test-infra:kubectl -- delete pod -l app.kubernetes.io/name=search-apiserver -n search-system
+        task test-infra:kubectl -- delete pod -l app.kubernetes.io/name=search-controller-manager -n search-system
+        task test-infra:kubectl -- delete pod -l app.kubernetes.io/name=resource-indexer -n search-system
 
         echo "✅ Redeployment complete!"
         echo "Check pods with: task test-infra:kubectl -- get pods -n search-system"

cmd/search/main.go

@@ -183,7 +183,7 @@ func (o *SearchServerOptions) Config() (*searchapiserver.Config, error) {
 	genericConfig.EffectiveVersion = basecompatibility.NewEffectiveVersionFromString("1.35", "", "")
 
 	namer := apiopenapi.NewDefinitionNamer(searchapiserver.Scheme)
-	genericConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(openapi.GetOpenAPIDefinitions, namer)
+	genericConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(openapi.GetOpenAPIDefinitionsWithUnstructured, namer)
 	genericConfig.OpenAPIV3Config.Info.Title = "Search"
 	genericConfig.OpenAPIV3Config.Info.Version = version.Version
 	genericConfig.OpenAPIV3Config.GetDefinitionName = func(name string) (string, spec.Extensions) {
@@ -192,7 +192,7 @@ func (o *SearchServerOptions) Config() (*searchapiserver.Config, error) {
 	}
 
 	// Configure OpenAPI v2
-	genericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(openapi.GetOpenAPIDefinitions, namer)
+	genericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(openapi.GetOpenAPIDefinitionsWithUnstructured, namer)
 	genericConfig.OpenAPIConfig.Info.Title = "Search"
 	genericConfig.OpenAPIConfig.Info.Version = version.Version
 	genericConfig.OpenAPIConfig.GetDefinitionName = func(name string) (string, spec.Extensions) {

config/samples/search_v1alpha1_searchquery.yaml

@@ -9,4 +9,3 @@ spec:
       kind: ConfigMap
   query: "" # Empty query returns everything, or put a specific string
   limit: 20
-  offset: 0

internal/registry/searchquery/rest.go

@@ -11,6 +11,7 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -280,8 +281,13 @@ func formatSearchResult(hit map[string]json.RawMessage) (searchv1alpha1.SearchRe
 		return searchv1alpha1.SearchResult{}, err
 	}
 
+	var obj unstructured.Unstructured
+	if err := obj.UnmarshalJSON(b); err != nil {
+		return searchv1alpha1.SearchResult{}, err
+	}
+
 	return searchv1alpha1.SearchResult{
-		Resource:       runtime.RawExtension{Raw: b},
+		Resource:       obj,
 		RelevanceScore: score,
 	}, nil
 }

pkg/apis/search/v1alpha1/types.go

@@ -3,7 +3,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
 // +k8s:openapi-gen=true
@@ -80,7 +80,7 @@ type SearchQueryStatus struct {
 // SearchResult represents a single search result with its relevance score.
 type SearchResult struct {
 	// Resource contains the actual Kubernetes resource.
-	Resource runtime.RawExtension `json:"resource"`
+	Resource unstructured.Unstructured `json:"resource"`
 
 	// RelevanceScore is the relevance score from Meilisearch.
 	// +optional

pkg/generated/openapi/definitions.go

@@ -0,0 +1,31 @@
+package openapi
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+// GetOpenAPIDefinitionsWithUnstructured wraps the generated GetOpenAPIDefinitions
+// and adds the missing definition for unstructured.Unstructured, which is a
+// special Kubernetes type that does not carry +k8s:openapi-gen markers in upstream.
+//
+// unstructured.Unstructured is an open-ended JSON object (the same wire format as
+// runtime.RawExtension) so the OpenAPI schema is simply "type: object" with
+// x-kubernetes-preserve-unknown-fields to allow arbitrary fields.
+func GetOpenAPIDefinitionsWithUnstructured(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	defs := GetOpenAPIDefinitions(ref)
+	defs["k8s.io/apimachinery/pkg/apis/meta/v1/unstructured.Unstructured"] = common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Unstructured represents a Kubernetes resource as an arbitrary JSON object.",
+				Type:        []string{"object"},
+			},
+			VendorExtensible: spec.VendorExtensible{
+				Extensions: spec.Extensions{
+					"x-kubernetes-preserve-unknown-fields": true,
+				},
+			},
+		},
+	}
+	return defs
+}