Skip to content

Commit 2806f6a

Browse files
sivcharisivchari
committed
add CAPD exp v1beta2
Signed-off-by: sivchari <[email protected]>
1 parent 8614278 commit 2806f6a

22 files changed

+1259
-194
lines changed

‎test/infrastructure/docker/exp/api/v1alpha3/conversion.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020
apiconversion "k8s.io/apimachinery/pkg/conversion"
2121
"sigs.k8s.io/controller-runtime/pkg/conversion"
2222

23-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
23+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
2424
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2525
)
2626

2727
func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error {
2828
dst := dstRaw.(*infraexpv1.DockerMachinePool)
2929

30-
if err := Convert_v1alpha3_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil); err != nil {
30+
if err := Convert_v1alpha3_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil {
3131
return err
3232
}
3333

@@ -45,16 +45,16 @@ func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error {
4545
func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error {
4646
src := srcRaw.(*infraexpv1.DockerMachinePool)
4747

48-
if err := Convert_v1beta1_DockerMachinePool_To_v1alpha3_DockerMachinePool(src, dst, nil); err != nil {
48+
if err := Convert_v1beta2_DockerMachinePool_To_v1alpha3_DockerMachinePool(src, dst, nil); err != nil {
4949
return err
5050
}
5151

5252
// Preserve Hub data on down-conversion except for metadata
5353
return utilconversion.MarshalData(src, dst)
5454
}
5555

56-
// Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus is an autogenerated conversion function.
57-
func Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error {
56+
// Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus is an autogenerated conversion function.
57+
func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error {
5858
// NOTE: custom conversion func is required because Status.InfrastructureMachineKind has been added in v1beta1.
59-
return autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in, out, s)
59+
return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha3_DockerMachinePoolStatus(in, out, s)
6060
}

‎test/infrastructure/docker/exp/api/v1alpha3/conversion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package v1alpha3
2121
import (
2222
"testing"
2323

24-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
24+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
2525
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2626
)
2727

‎test/infrastructure/docker/exp/api/v1alpha3/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
// Package v1alpha3 contains the v1alpha3 API implementation.
18-
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1
18+
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2
1919
//
2020
// Deprecated: This package will be removed in one of the next releases.
2121
package v1alpha3

‎test/infrastructure/docker/exp/api/v1alpha3/zz_generated.conversion.go

Lines changed: 85 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/infrastructure/docker/exp/api/v1alpha4/conversion.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020
apiconversion "k8s.io/apimachinery/pkg/conversion"
2121
"sigs.k8s.io/controller-runtime/pkg/conversion"
2222

23-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
23+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
2424
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2525
)
2626

2727
func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error {
2828
dst := dstRaw.(*infraexpv1.DockerMachinePool)
2929

30-
if err := Convert_v1alpha4_DockerMachinePool_To_v1beta1_DockerMachinePool(src, dst, nil); err != nil {
30+
if err := Convert_v1alpha4_DockerMachinePool_To_v1beta2_DockerMachinePool(src, dst, nil); err != nil {
3131
return err
3232
}
3333

@@ -45,15 +45,15 @@ func (src *DockerMachinePool) ConvertTo(dstRaw conversion.Hub) error {
4545
func (dst *DockerMachinePool) ConvertFrom(srcRaw conversion.Hub) error {
4646
src := srcRaw.(*infraexpv1.DockerMachinePool)
4747

48-
if err := Convert_v1beta1_DockerMachinePool_To_v1alpha4_DockerMachinePool(src, dst, nil); err != nil {
48+
if err := Convert_v1beta2_DockerMachinePool_To_v1alpha4_DockerMachinePool(src, dst, nil); err != nil {
4949
return err
5050
}
5151

5252
// Preserve Hub data on down-conversion except for metadata
5353
return utilconversion.MarshalData(src, dst)
5454
}
5555

56-
func Convert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error {
56+
func Convert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in *infraexpv1.DockerMachinePoolStatus, out *DockerMachinePoolStatus, s apiconversion.Scope) error {
5757
// NOTE: custom conversion func is required because Status.InfrastructureMachineKind has been added in v1beta1.
58-
return autoConvert_v1beta1_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in, out, s)
58+
return autoConvert_v1beta2_DockerMachinePoolStatus_To_v1alpha4_DockerMachinePoolStatus(in, out, s)
5959
}

‎test/infrastructure/docker/exp/api/v1alpha4/conversion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package v1alpha4
2121
import (
2222
"testing"
2323

24-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
24+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
2525
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2626
)
2727

‎test/infrastructure/docker/exp/api/v1alpha4/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
*/
1616

1717
// Package v1alpha4 contains the v1alpha4 API implementation.
18-
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1
18+
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2
1919
//
2020
// Deprecated: This package will be removed in one of the next releases.
2121
package v1alpha4

0 commit comments

Comments
 (0)