Update fake-apiserver deps

Signed-off-by: Arnob kumar saha <arnob@appscode.com>

Author: ArnobKumarSaha

go.mod

@@ -23,7 +23,7 @@ require (
 	k8s.io/kubectl v0.32.2
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 	kmodules.xyz/client-go v0.32.1
-	kmodules.xyz/fake-apiserver v0.0.5
+	kmodules.xyz/fake-apiserver v0.0.6
 	kmodules.xyz/resource-metadata v0.27.0
 	kubepack.dev/lib-app v0.1.0
 	kubepack.dev/lib-helm v0.29.13

go.sum

@@ -1048,8 +1048,8 @@ kmodules.xyz/apply v0.29.0 h1:0OXGfE2IPuvXHk6uI9zp6KCYdBibx8mK4PEl0g3LZ44=
 kmodules.xyz/apply v0.29.0/go.mod h1:bwToXErB+DC7/EEWjQVARCSbJBjGx5hIEuV1n0tC73g=
 kmodules.xyz/client-go v0.32.1 h1:W8TWGBBaokQEqfesbdhlRFMMV0TChcRbMRQ0eTIRS88=
 kmodules.xyz/client-go v0.32.1/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
-kmodules.xyz/fake-apiserver v0.0.5 h1:4HjlHY7/qpJjlmSDmID6XzpgeCDErCjib/8/+tbRpP4=
-kmodules.xyz/fake-apiserver v0.0.5/go.mod h1:ZpoVMtknbGJ2j1MTEbBAqUN4QWHFPXlRVMX96KfxSLU=
+kmodules.xyz/fake-apiserver v0.0.6 h1:n/3Nd8BkjCvEn/Daen2gyb6V9+YlOrOB/8Miavfu30U=
+kmodules.xyz/fake-apiserver v0.0.6/go.mod h1:49c+tJQ24leVKsrdL0qWezeP3GXZzTKSi147ddtbIW8=
 kmodules.xyz/go-containerregistry v0.0.14 h1:8MgLFa74HymAJEyjH7fyQJn5u2Ok6qPPFQX8ARfcXp0=
 kmodules.xyz/go-containerregistry v0.0.14/go.mod h1:xz0iGC3noyMi5NNAzXWTH6KqfiIgFWZAomw+U2zVOXs=
 kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=

vendor/kmodules.xyz/fake-apiserver/pkg/create.go

@@ -31,6 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilrand "k8s.io/apimachinery/pkg/util/rand"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 )
 
 func (s *Server) Create(w http.ResponseWriter, r *http.Request) {
@@ -60,17 +61,34 @@ func (s *Server) CreateImpl(store *APIStorage, codec runtime.Codec, r *http.Requ
 		return nil, err
 	}
 
-	var obj unstructured.Unstructured
-	_, _, err = codec.Decode(data, &store.GVK, &obj)
+	isOfficialType := clientgoscheme.Scheme.IsGroupRegistered(store.GVK.Group)
+
+	var into runtime.Object
+	if !isOfficialType {
+		var u unstructured.Unstructured
+		u.SetGroupVersionKind(store.GVK)
+		into = &u
+	}
+	o2, _, err := codec.Decode(data, &store.GVK, into)
 	if err != nil {
 		return nil, err
 	}
-	if obj.GetGenerateName() != "" {
-		obj.SetName(fmt.Sprintf("%s-%s", obj.GetGenerateName(), utilrand.String(6)))
+
+	var obj unstructured.Unstructured
+	if isOfficialType {
+		content, err := runtime.DefaultUnstructuredConverter.ToUnstructured(o2)
+		if err != nil {
+			return nil, err
+		}
+
+		obj.SetGroupVersionKind(store.GVK)
+		obj.SetUnstructuredContent(content)
+	} else {
+		obj = *into.(*unstructured.Unstructured)
 	}
 
-	if obj.GetName() == "kubedb" {
-		fmt.Println("wait")
+	if obj.GetGenerateName() != "" {
+		obj.SetName(fmt.Sprintf("%s-%s", obj.GetGenerateName(), utilrand.String(6)))
 	}
 
 	if store.Namespaced {

vendor/kmodules.xyz/fake-apiserver/pkg/server.go

@@ -33,6 +33,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"gomodules.xyz/sets"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -78,6 +79,7 @@ func NewOptions(apigroups ...string) *Options {
 	)
 
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+	utilruntime.Must(apiextensionsv1.AddToScheme(scheme))
 	metav1.AddToGroupVersion(scheme, metav1.SchemeGroupVersion)
 
 	// TODO: keep the generic API server from wanting this
@@ -174,7 +176,7 @@ func (s *Server) Register(m chi.Router) {
 }
 
 func (s *Server) encoder(w http.ResponseWriter, r *http.Request) runtime.Encoder {
-	outputMediaType, _, err := negotiation.NegotiateOutputMediaType(r, s.opts.NegotiatedSerializer, negotiation.DefaultEndpointRestrictions)
+	outputMediaType, _, err := negotiation.NegotiateOutputMediaType(r, OutputSerializer{delegate: s.opts.NegotiatedSerializer}, negotiation.DefaultEndpointRestrictions)
 	if err != nil {
 		panic(err)
 	}
@@ -351,3 +353,28 @@ func atoi(s string) int {
 	i, _ := strconv.Atoi(s)
 	return i
 }
+
+type OutputSerializer struct {
+	delegate runtime.NegotiatedSerializer
+}
+
+var _ runtime.NegotiatedSerializer = &OutputSerializer{}
+
+func (o OutputSerializer) SupportedMediaTypes() []runtime.SerializerInfo {
+	a := o.delegate.SupportedMediaTypes()
+	b := a[:0]
+	for _, x := range a {
+		if x.MediaType != runtime.ContentTypeProtobuf {
+			b = append(b, x)
+		}
+	}
+	return b
+}
+
+func (o OutputSerializer) EncoderForVersion(serializer runtime.Encoder, gv runtime.GroupVersioner) runtime.Encoder {
+	return o.delegate.EncoderForVersion(serializer, gv)
+}
+
+func (o OutputSerializer) DecoderToVersion(serializer runtime.Decoder, gv runtime.GroupVersioner) runtime.Decoder {
+	return o.delegate.DecoderToVersion(serializer, gv)
+}

vendor/kmodules.xyz/fake-apiserver/pkg/update.go

@@ -28,6 +28,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 )
 
 func (s *Server) Update(w http.ResponseWriter, r *http.Request) {
@@ -55,11 +56,32 @@ func (s *Server) UpdateImpl(store *APIStorage, codec runtime.Codec, r *http.Requ
 		return nil, err
 	}
 
-	var obj unstructured.Unstructured
-	_, _, err = codec.Decode(data, &store.GVK, &obj)
+	isOfficialType := clientgoscheme.Scheme.IsGroupRegistered(store.GVK.Group)
+
+	var into runtime.Object
+	if !isOfficialType {
+		var u unstructured.Unstructured
+		u.SetGroupVersionKind(store.GVK)
+		into = &u
+	}
+	o2, _, err := codec.Decode(data, &store.GVK, into)
 	if err != nil {
 		return nil, err
 	}
+
+	var obj unstructured.Unstructured
+	if isOfficialType {
+		content, err := runtime.DefaultUnstructuredConverter.ToUnstructured(o2)
+		if err != nil {
+			return nil, err
+		}
+
+		obj.SetGroupVersionKind(store.GVK)
+		obj.SetUnstructuredContent(content)
+	} else {
+		obj = *into.(*unstructured.Unstructured)
+	}
+
 	if store.Namespaced {
 		ns := chi.URLParam(r, "namespace")
 		obj.SetNamespace(ns)

vendor/modules.txt

@@ -2072,7 +2072,7 @@ kmodules.xyz/client-go/meta
 kmodules.xyz/client-go/tools/clientcmd
 kmodules.xyz/client-go/tools/parser
 kmodules.xyz/client-go/tools/wait
-# kmodules.xyz/fake-apiserver v0.0.5
+# kmodules.xyz/fake-apiserver v0.0.6
 ## explicit; go 1.23.0
 kmodules.xyz/fake-apiserver/pkg
 kmodules.xyz/fake-apiserver/pkg/resources