Skip to content

Commit

Permalink
removed references to aws cloud
Browse files Browse the repository at this point in the history
  • Loading branch information
alejandroEsc committed Jul 19, 2018
1 parent 2c79bdd commit b254423
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 67 deletions.
2 changes: 1 addition & 1 deletion cloud/skeleton/providerconfig/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// limitations under the License.

// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-skeleton/cloud/aws/providerconfig
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-skeleton/cloud/skeleton/providerconfig
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta

Expand Down
8 changes: 4 additions & 4 deletions cloud/skeleton/providerconfig/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ func Resource(resource string) schema.GroupResource {

func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSMachineProviderConfig{},
&SkeletonMachineProviderConfig{},
)
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSClusterProviderConfig{},
&SkeletonClusterProviderConfig{},
)
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSMachineProviderStatus{},
&SkeletonMachineProviderStatus{},
)
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSClusterProviderStatus{},
&SkeletonClusterProviderStatus{},
)
return nil
}
8 changes: 4 additions & 4 deletions cloud/skeleton/providerconfig/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ import (
)

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSMachineProviderConfig struct {
type SkeletonMachineProviderConfig struct {
metav1.TypeMeta `json:",inline"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderConfig struct {
type SkeletonClusterProviderConfig struct {
metav1.TypeMeta `json:",inline"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSMachineProviderStatus struct {
type SkeletonMachineProviderStatus struct {
metav1.TypeMeta `json:",inline"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderStatus struct {
type SkeletonClusterProviderStatus struct {
metav1.TypeMeta `json:",inline"`
}
2 changes: 1 addition & 1 deletion cloud/skeleton/providerconfig/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// limitations under the License.

// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-skeleton/cloud/aws/providerconfig
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-skeleton/cloud/skeleton/providerconfig
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta

Expand Down
24 changes: 12 additions & 12 deletions cloud/skeleton/providerconfig/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"

"sigs.k8s.io/cluster-api-provider-skeleton/cloud/aws/providerconfig"
"sigs.k8s.io/cluster-api-provider-skeleton/cloud/skeleton/providerconfig"
)

// +k8s:deepcopy-gen=false
type AWSProviderConfigCodec struct {
type SkeletonProviderConfigCodec struct {
encoder runtime.Encoder
decoder runtime.Decoder
}
Expand All @@ -47,16 +47,16 @@ func init() {

func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSMachineProviderConfig{},
&SkeletonMachineProviderConfig{},
)
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSClusterProviderConfig{},
&SkeletonClusterProviderConfig{},
)
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSMachineProviderStatus{},
&SkeletonMachineProviderStatus{},
)
scheme.AddKnownTypes(SchemeGroupVersion,
&AWSClusterProviderStatus{},
&SkeletonClusterProviderStatus{},
)
return nil
}
Expand All @@ -72,7 +72,7 @@ func NewScheme() (*runtime.Scheme, error) {
return scheme, nil
}

func NewCodec() (*AWSProviderConfigCodec, error) {
func NewCodec() (*SkeletonProviderConfigCodec, error) {
scheme, err := NewScheme()
if err != nil {
return nil, err
Expand All @@ -82,14 +82,14 @@ func NewCodec() (*AWSProviderConfigCodec, error) {
if err != nil {
return nil, err
}
codec := AWSProviderConfigCodec{
codec := SkeletonProviderConfigCodec{
encoder: encoder,
decoder: codecFactory.UniversalDecoder(SchemeGroupVersion),
}
return &codec, nil
}

func (codec *AWSProviderConfigCodec) DecodeFromProviderConfig(providerConfig clusterv1.ProviderConfig, out runtime.Object) error {
func (codec *SkeletonProviderConfigCodec) DecodeFromProviderConfig(providerConfig clusterv1.ProviderConfig, out runtime.Object) error {
if providerConfig.Value != nil {
_, _, err := codec.decoder.Decode(providerConfig.Value.Raw, nil, out)
if err != nil {
Expand All @@ -99,7 +99,7 @@ func (codec *AWSProviderConfigCodec) DecodeFromProviderConfig(providerConfig clu
return nil
}

func (codec *AWSProviderConfigCodec) EncodeToProviderConfig(in runtime.Object) (*clusterv1.ProviderConfig, error) {
func (codec *SkeletonProviderConfigCodec) EncodeToProviderConfig(in runtime.Object) (*clusterv1.ProviderConfig, error) {
var buf bytes.Buffer
if err := codec.encoder.Encode(in, &buf); err != nil {
return nil, fmt.Errorf("encoding failed: %v", err)
Expand All @@ -109,7 +109,7 @@ func (codec *AWSProviderConfigCodec) EncodeToProviderConfig(in runtime.Object) (
}, nil
}

func (codec *AWSProviderConfigCodec) EncodeProviderStatus(in runtime.Object) (*runtime.RawExtension, error) {
func (codec *SkeletonProviderConfigCodec) EncodeProviderStatus(in runtime.Object) (*runtime.RawExtension, error) {
var buf bytes.Buffer
if err := codec.encoder.Encode(in, &buf); err != nil {
return nil, fmt.Errorf("encoding failed: %v", err)
Expand All @@ -118,7 +118,7 @@ func (codec *AWSProviderConfigCodec) EncodeProviderStatus(in runtime.Object) (*r
return &runtime.RawExtension{Raw: buf.Bytes()}, nil
}

func (codec *AWSProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error {
func (codec *SkeletonProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error {
if providerStatus != nil {
_, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions cloud/skeleton/providerconfig/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ import (
)

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSMachineProviderConfig struct {
type SkeletonMachineProviderConfig struct {
metav1.TypeMeta `json:",inline"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderConfig struct {
type SkeletonClusterProviderConfig struct {
metav1.TypeMeta `json:",inline"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSMachineProviderStatus struct {
type SkeletonMachineProviderStatus struct {
metav1.TypeMeta `json:",inline"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderStatus struct {
type SkeletonClusterProviderStatus struct {
metav1.TypeMeta `json:",inline"`
}
40 changes: 20 additions & 20 deletions cloud/skeleton/providerconfig/v1alpha1/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ import (
)

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSClusterProviderConfig) DeepCopyInto(out *AWSClusterProviderConfig) {
func (in *SkeletonClusterProviderConfig) DeepCopyInto(out *SkeletonClusterProviderConfig) {
*out = *in
out.TypeMeta = in.TypeMeta
return
}

// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSClusterProviderConfig.
func (in *AWSClusterProviderConfig) DeepCopy() *AWSClusterProviderConfig {
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonClusterProviderConfig.
func (in *SkeletonClusterProviderConfig) DeepCopy() *SkeletonClusterProviderConfig {
if in == nil {
return nil
}
out := new(AWSClusterProviderConfig)
out := new(SkeletonClusterProviderConfig)
in.DeepCopyInto(out)
return out
}

// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *AWSClusterProviderConfig) DeepCopyObject() runtime.Object {
func (in *SkeletonClusterProviderConfig) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
} else {
Expand All @@ -48,24 +48,24 @@ func (in *AWSClusterProviderConfig) DeepCopyObject() runtime.Object {
}

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSClusterProviderStatus) DeepCopyInto(out *AWSClusterProviderStatus) {
func (in *SkeletonClusterProviderStatus) DeepCopyInto(out *SkeletonClusterProviderStatus) {
*out = *in
out.TypeMeta = in.TypeMeta
return
}

// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSClusterProviderStatus.
func (in *AWSClusterProviderStatus) DeepCopy() *AWSClusterProviderStatus {
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonClusterProviderStatus.
func (in *SkeletonClusterProviderStatus) DeepCopy() *SkeletonClusterProviderStatus {
if in == nil {
return nil
}
out := new(AWSClusterProviderStatus)
out := new(SkeletonClusterProviderStatus)
in.DeepCopyInto(out)
return out
}

// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *AWSClusterProviderStatus) DeepCopyObject() runtime.Object {
func (in *SkeletonClusterProviderStatus) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
} else {
Expand All @@ -74,24 +74,24 @@ func (in *AWSClusterProviderStatus) DeepCopyObject() runtime.Object {
}

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSMachineProviderConfig) DeepCopyInto(out *AWSMachineProviderConfig) {
func (in *SkeletonMachineProviderConfig) DeepCopyInto(out *SkeletonMachineProviderConfig) {
*out = *in
out.TypeMeta = in.TypeMeta
return
}

// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderConfig.
func (in *AWSMachineProviderConfig) DeepCopy() *AWSMachineProviderConfig {
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonMachineProviderConfig.
func (in *SkeletonMachineProviderConfig) DeepCopy() *SkeletonMachineProviderConfig {
if in == nil {
return nil
}
out := new(AWSMachineProviderConfig)
out := new(SkeletonMachineProviderConfig)
in.DeepCopyInto(out)
return out
}

// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *AWSMachineProviderConfig) DeepCopyObject() runtime.Object {
func (in *SkeletonMachineProviderConfig) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
} else {
Expand All @@ -100,24 +100,24 @@ func (in *AWSMachineProviderConfig) DeepCopyObject() runtime.Object {
}

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSMachineProviderStatus) DeepCopyInto(out *AWSMachineProviderStatus) {
func (in *SkeletonMachineProviderStatus) DeepCopyInto(out *SkeletonMachineProviderStatus) {
*out = *in
out.TypeMeta = in.TypeMeta
return
}

// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderStatus.
func (in *AWSMachineProviderStatus) DeepCopy() *AWSMachineProviderStatus {
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonMachineProviderStatus.
func (in *SkeletonMachineProviderStatus) DeepCopy() *SkeletonMachineProviderStatus {
if in == nil {
return nil
}
out := new(AWSMachineProviderStatus)
out := new(SkeletonMachineProviderStatus)
in.DeepCopyInto(out)
return out
}

// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
func (in *AWSMachineProviderStatus) DeepCopyObject() runtime.Object {
func (in *SkeletonMachineProviderStatus) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
} else {
Expand Down
Loading

0 comments on commit b254423

Please sign in to comment.