Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add serializer to remove protobuf support #51

Merged
merged 1 commit into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/api/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ func BuildPolicyReports(polr, cpolr rest.Storage) genericapiserver.APIGroupInfo
"clusterpolicyreports": cpolr,
}
apiGroupInfo.VersionedResourcesStorageMap[v1alpha2.SchemeGroupVersion.Version] = policyReportsResources
apiGroupInfo.NegotiatedSerializer = DefaultSubsetNegotiatedSerializer(Codecs)

return apiGroupInfo
}
Expand All @@ -63,6 +64,7 @@ func BuildEphemeralReports(ephr, cephr rest.Storage) genericapiserver.APIGroupIn
"clusterephemeralreports": cephr,
}
apiGroupInfo.VersionedResourcesStorageMap[reportsv1.SchemeGroupVersion.Version] = ephemeralReportsResources
apiGroupInfo.NegotiatedSerializer = DefaultSubsetNegotiatedSerializer(Codecs)

return apiGroupInfo
}
Expand Down
37 changes: 37 additions & 0 deletions pkg/api/serializer.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package api

import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
)

type subsetNegotiatedSerializer struct {
accepts []func(info runtime.SerializerInfo) bool
runtime.NegotiatedSerializer
}

func (s subsetNegotiatedSerializer) SupportedMediaTypes() []runtime.SerializerInfo {
base := s.NegotiatedSerializer.SupportedMediaTypes()
var filtered []runtime.SerializerInfo
for _, info := range base {
for _, accept := range s.accepts {
if accept(info) {
filtered = append(filtered, info)
break
}
}
}
return filtered
}

func NoProtobuf(info runtime.SerializerInfo) bool {
return info.MediaType != runtime.ContentTypeProtobuf
}

func SubsetNegotiatedSerializer(codecs serializer.CodecFactory, accepts ...func(info runtime.SerializerInfo) bool) runtime.NegotiatedSerializer {
return subsetNegotiatedSerializer{accepts, codecs}
}

func DefaultSubsetNegotiatedSerializer(codecs serializer.CodecFactory) runtime.NegotiatedSerializer {
return SubsetNegotiatedSerializer(codecs, NoProtobuf)
}
3 changes: 2 additions & 1 deletion pkg/app/opts/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ func (o Options) restConfig() (*rest.Config, error) {
return nil, fmt.Errorf("unable to construct lister client config: %v", err)
}

// config.ContentType = "application/vnd.kubernetes.protobuf"
// config.ContentType = "application/json"
// config.AcceptContentTypes = "application/json,application/vnd.kubernetes.protobuf"

err = rest.SetKubernetesDefaults(config)
if err != nil {
Expand Down
Loading