Skip to content

don't register non-core types into scheme #219

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.

Sign up for GitHub

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

Closed
joelddiaz wants to merge 1 commit into from
Closed

don't register non-core types into scheme #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions pkg/apis/cloudcredential/v1/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
)

// NewScheme creates a new Scheme
func NewScheme() (*runtime.Scheme, error) {
s := runtime.NewScheme()
return s, SchemeBuilder.AddToScheme(s)
}

// ProviderCodec is a runtime codec for providers.
// +k8s:deepcopy-gen=false
type ProviderCodec struct {
Expand All @@ -39,10 +33,14 @@ type ProviderCodec struct {

// NewCodec creates a serializer/deserializer for the provider configuration
func NewCodec() (*ProviderCodec, error) {
scheme, err := NewScheme()
if err != nil {
return nil, err
}
scheme := runtime.NewScheme()
scheme.AddKnownTypes(SchemeGroupVersion,
&CredentialsRequest{}, &CredentialsRequestList{},
&AWSProviderSpec{}, &AWSProviderStatus{},
&AzureProviderSpec{}, &AzureProviderStatus{},
&GCPProviderSpec{}, &GCPProviderStatus{},
&VSphereProviderSpec{}, &VSphereProviderStatus{},
)
codecFactory := serializer.NewCodecFactory(scheme)
encoder, err := newEncoder(&codecFactory)
if err != nil {
Expand All @@ -55,7 +53,7 @@ func NewCodec() (*ProviderCodec, error) {
return &codec, nil
}

// EncodeProvider serializes an object to the provider spec.
// EncodeProviderSpec serializes an object to the provider spec.
func (codec *ProviderCodec) EncodeProviderSpec(in runtime.Object) (*runtime.RawExtension, error) {
var buf bytes.Buffer
if err := codec.encoder.Encode(in, &buf); err != nil {
Expand Down
4 changes: 0 additions & 4 deletions pkg/apis/cloudcredential/v1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {

scheme.AddKnownTypes(SchemeGroupVersion,
&CredentialsRequest{}, &CredentialsRequestList{},
&AWSProviderStatus{}, &AWSProviderSpec{},
&AzureProviderStatus{}, &AzureProviderSpec{},
&GCPProviderStatus{}, &GCPProviderSpec{},
&VSphereProviderStatus{}, &VSphereProviderSpec{},
)

return nil
Expand Down