Skip to content

Commit e24ff11

Browse files
davidewatsondavidewatson
authored
Merge pull request kubernetes-sigs#2 from alejandroEsc/ae/aws/remove
removed references to aws cloud
2 parents 15f50b3 + b254423 commit e24ff11

File tree

7 files changed

+64
-64
lines changed

7 files changed

+64
-64
lines changed

‎cloud/skeleton/providerconfig/register.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ func Resource(resource string) schema.GroupResource {
4242

4343
func addKnownTypes(scheme *runtime.Scheme) error {
4444
scheme.AddKnownTypes(SchemeGroupVersion,
45-
&AWSMachineProviderConfig{},
45+
&SkeletonMachineProviderConfig{},
4646
)
4747
scheme.AddKnownTypes(SchemeGroupVersion,
48-
&AWSClusterProviderConfig{},
48+
&SkeletonClusterProviderConfig{},
4949
)
5050
scheme.AddKnownTypes(SchemeGroupVersion,
51-
&AWSMachineProviderStatus{},
51+
&SkeletonMachineProviderStatus{},
5252
)
5353
scheme.AddKnownTypes(SchemeGroupVersion,
54-
&AWSClusterProviderStatus{},
54+
&SkeletonClusterProviderStatus{},
5555
)
5656
return nil
5757
}

‎cloud/skeleton/providerconfig/types.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ import (
1818
)
1919

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

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

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

3535
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
36-
type AWSClusterProviderStatus struct {
36+
type SkeletonClusterProviderStatus struct {
3737
metav1.TypeMeta `json:",inline"`
3838
}

‎cloud/skeleton/providerconfig/v1alpha1/register.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
// +k8s:deepcopy-gen=false
29-
type AWSProviderConfigCodec struct {
29+
type SkeletonProviderConfigCodec struct {
3030
encoder runtime.Encoder
3131
decoder runtime.Decoder
3232
}
@@ -47,16 +47,16 @@ func init() {
4747

4848
func addKnownTypes(scheme *runtime.Scheme) error {
4949
scheme.AddKnownTypes(SchemeGroupVersion,
50-
&AWSMachineProviderConfig{},
50+
&SkeletonMachineProviderConfig{},
5151
)
5252
scheme.AddKnownTypes(SchemeGroupVersion,
53-
&AWSClusterProviderConfig{},
53+
&SkeletonClusterProviderConfig{},
5454
)
5555
scheme.AddKnownTypes(SchemeGroupVersion,
56-
&AWSMachineProviderStatus{},
56+
&SkeletonMachineProviderStatus{},
5757
)
5858
scheme.AddKnownTypes(SchemeGroupVersion,
59-
&AWSClusterProviderStatus{},
59+
&SkeletonClusterProviderStatus{},
6060
)
6161
return nil
6262
}
@@ -72,7 +72,7 @@ func NewScheme() (*runtime.Scheme, error) {
7272
return scheme, nil
7373
}
7474

75-
func NewCodec() (*AWSProviderConfigCodec, error) {
75+
func NewCodec() (*SkeletonProviderConfigCodec, error) {
7676
scheme, err := NewScheme()
7777
if err != nil {
7878
return nil, err
@@ -82,14 +82,14 @@ func NewCodec() (*AWSProviderConfigCodec, error) {
8282
if err != nil {
8383
return nil, err
8484
}
85-
codec := AWSProviderConfigCodec{
85+
codec := SkeletonProviderConfigCodec{
8686
encoder: encoder,
8787
decoder: codecFactory.UniversalDecoder(SchemeGroupVersion),
8888
}
8989
return &codec, nil
9090
}
9191

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

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

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

121-
func (codec *AWSProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error {
121+
func (codec *SkeletonProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error {
122122
if providerStatus != nil {
123123
_, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out)
124124
if err != nil {

‎cloud/skeleton/providerconfig/v1alpha1/types.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ import (
1818
)
1919

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

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

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

3535
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
36-
type AWSClusterProviderStatus struct {
36+
type SkeletonClusterProviderStatus struct {
3737
metav1.TypeMeta `json:",inline"`
3838
}

‎cloud/skeleton/providerconfig/v1alpha1/zz_generated.deepcopy.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ import (
2222
)
2323

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

31-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSClusterProviderConfig.
32-
func (in *AWSClusterProviderConfig) DeepCopy() *AWSClusterProviderConfig {
31+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonClusterProviderConfig.
32+
func (in *SkeletonClusterProviderConfig) DeepCopy() *SkeletonClusterProviderConfig {
3333
if in == nil {
3434
return nil
3535
}
36-
out := new(AWSClusterProviderConfig)
36+
out := new(SkeletonClusterProviderConfig)
3737
in.DeepCopyInto(out)
3838
return out
3939
}
4040

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

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

57-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSClusterProviderStatus.
58-
func (in *AWSClusterProviderStatus) DeepCopy() *AWSClusterProviderStatus {
57+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonClusterProviderStatus.
58+
func (in *SkeletonClusterProviderStatus) DeepCopy() *SkeletonClusterProviderStatus {
5959
if in == nil {
6060
return nil
6161
}
62-
out := new(AWSClusterProviderStatus)
62+
out := new(SkeletonClusterProviderStatus)
6363
in.DeepCopyInto(out)
6464
return out
6565
}
6666

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

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

83-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderConfig.
84-
func (in *AWSMachineProviderConfig) DeepCopy() *AWSMachineProviderConfig {
83+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonMachineProviderConfig.
84+
func (in *SkeletonMachineProviderConfig) DeepCopy() *SkeletonMachineProviderConfig {
8585
if in == nil {
8686
return nil
8787
}
88-
out := new(AWSMachineProviderConfig)
88+
out := new(SkeletonMachineProviderConfig)
8989
in.DeepCopyInto(out)
9090
return out
9191
}
9292

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

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

109-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderStatus.
110-
func (in *AWSMachineProviderStatus) DeepCopy() *AWSMachineProviderStatus {
109+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonMachineProviderStatus.
110+
func (in *SkeletonMachineProviderStatus) DeepCopy() *SkeletonMachineProviderStatus {
111111
if in == nil {
112112
return nil
113113
}
114-
out := new(AWSMachineProviderStatus)
114+
out := new(SkeletonMachineProviderStatus)
115115
in.DeepCopyInto(out)
116116
return out
117117
}
118118

119119
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
120-
func (in *AWSMachineProviderStatus) DeepCopyObject() runtime.Object {
120+
func (in *SkeletonMachineProviderStatus) DeepCopyObject() runtime.Object {
121121
if c := in.DeepCopy(); c != nil {
122122
return c
123123
} else {

‎cloud/skeleton/providerconfig/zz_generated.deepcopy.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ import (
2222
)
2323

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

31-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSClusterProviderConfig.
32-
func (in *AWSClusterProviderConfig) DeepCopy() *AWSClusterProviderConfig {
31+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonClusterProviderConfig.
32+
func (in *SkeletonClusterProviderConfig) DeepCopy() *SkeletonClusterProviderConfig {
3333
if in == nil {
3434
return nil
3535
}
36-
out := new(AWSClusterProviderConfig)
36+
out := new(SkeletonClusterProviderConfig)
3737
in.DeepCopyInto(out)
3838
return out
3939
}
4040

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

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

57-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSClusterProviderStatus.
58-
func (in *AWSClusterProviderStatus) DeepCopy() *AWSClusterProviderStatus {
57+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonClusterProviderStatus.
58+
func (in *SkeletonClusterProviderStatus) DeepCopy() *SkeletonClusterProviderStatus {
5959
if in == nil {
6060
return nil
6161
}
62-
out := new(AWSClusterProviderStatus)
62+
out := new(SkeletonClusterProviderStatus)
6363
in.DeepCopyInto(out)
6464
return out
6565
}
6666

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

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

83-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderConfig.
84-
func (in *AWSMachineProviderConfig) DeepCopy() *AWSMachineProviderConfig {
83+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonMachineProviderConfig.
84+
func (in *SkeletonMachineProviderConfig) DeepCopy() *SkeletonMachineProviderConfig {
8585
if in == nil {
8686
return nil
8787
}
88-
out := new(AWSMachineProviderConfig)
88+
out := new(SkeletonMachineProviderConfig)
8989
in.DeepCopyInto(out)
9090
return out
9191
}
9292

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

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

109-
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSMachineProviderStatus.
110-
func (in *AWSMachineProviderStatus) DeepCopy() *AWSMachineProviderStatus {
109+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SkeletonMachineProviderStatus.
110+
func (in *SkeletonMachineProviderStatus) DeepCopy() *SkeletonMachineProviderStatus {
111111
if in == nil {
112112
return nil
113113
}
114-
out := new(AWSMachineProviderStatus)
114+
out := new(SkeletonMachineProviderStatus)
115115
in.DeepCopyInto(out)
116116
return out
117117
}
118118

119119
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
120-
func (in *AWSMachineProviderStatus) DeepCopyObject() runtime.Object {
120+
func (in *SkeletonMachineProviderStatus) DeepCopyObject() runtime.Object {
121121
if c := in.DeepCopy(); c != nil {
122122
return c
123123
} else {

0 commit comments

Comments
 (0)