Skip to content

Commit a84743f

Browse files
akutzakutz
committed
v1alpha6
This patch introduces API version v1alpha6. There are no changes in this API version, rather it *enables* making API changes on main without impacting the latest, shipping API.
1 parent c7bb0f8 commit a84743f

File tree

514 files changed

+40609
-6953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

514 files changed

+40609
-6953
lines changed

‎.golangci.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,24 @@ linters:
142142
- alias: vmopv1a4sysprep
143143
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha4/sysprep
144144

145-
- alias: vmopv1
145+
- alias: vmopv1a5
146146
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha5
147-
- alias: vmopv1cloudinit
147+
- alias: vmopv1a5cloudinit
148148
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha5/cloudinit
149-
- alias: vmopv1common
149+
- alias: vmopv1a5common
150150
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha5/common
151-
- alias: vmopv1sysprep
151+
- alias: vmopv1a5sysprep
152152
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha5/sysprep
153153

154+
- alias: vmopv1
155+
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha6
156+
- alias: vmopv1cloudinit
157+
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha6/cloudinit
158+
- alias: vmopv1common
159+
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha6/common
160+
- alias: vmopv1sysprep
161+
pkg: github.com/vmware-tanzu/vm-operator/api/v1alpha6/sysprep
162+
154163
- alias: vmopv1util
155164
pkg: github.com/vmware-tanzu/vm-operator/pkg/util/vmopv1
156165

‎Makefile‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -506,15 +506,19 @@ generate-go-conversions: $(CONVERSION_GEN)
506506
endif
507507

508508
EXTRA_PEER_DIRS := ./v1alpha2/sysprep/conversion/v1alpha2
509-
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha2/sysprep/conversion/v1alpha5
509+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha2/sysprep/conversion/v1alpha6
510510
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha3/sysprep/conversion/v1alpha3
511-
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha3/sysprep/conversion/v1alpha5
511+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha3/sysprep/conversion/v1alpha6
512512
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha4/sysprep/conversion/v1alpha4
513-
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha4/sysprep/conversion/v1alpha5
513+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha4/sysprep/conversion/v1alpha6
514514
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha3/common/conversion/v1alpha3
515-
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha3/common/conversion/v1alpha5
515+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha3/common/conversion/v1alpha6
516516
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha4/common/conversion/v1alpha4
517-
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha4/common/conversion/v1alpha5
517+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha4/common/conversion/v1alpha6
518+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha5/sysprep/conversion/v1alpha5
519+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha5/sysprep/conversion/v1alpha6
520+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha5/common/conversion/v1alpha5
521+
EXTRA_PEER_DIRS := $(EXTRA_PEER_DIRS),./v1alpha5/common/conversion/v1alpha6
518522

519523
generate-go-conversions:
520524
cd api && \
@@ -523,7 +527,7 @@ generate-go-conversions:
523527
--output-file=zz_generated.conversion.go \
524528
--go-header-file=$(abspath hack/boilerplate/boilerplate.generatego.txt) \
525529
--extra-peer-dirs='$(EXTRA_PEER_DIRS)' \
526-
./v1alpha1 ./v1alpha2 ./v1alpha3 ./v1alpha4
530+
./v1alpha1 ./v1alpha2 ./v1alpha3 ./v1alpha4 ./v1alpha5 ./v1alpha6
527531

528532
else ifeq (symlink,$(CONVERSION_GEN_FALLBACK_MODE))
529533

@@ -655,6 +659,14 @@ generate-api-docs: ## Generate API documentation
655659
--output-path=./docs/ref/api/
656660
mv ./docs/ref/api/out.md ./docs/ref/api/v1alpha5.md
657661

662+
$(CRD_REF_DOCS) \
663+
--renderer=markdown \
664+
--source-path=./api/v1alpha6 \
665+
--config=./.crd-ref-docs/config.yaml \
666+
--templates-dir=./.crd-ref-docs/template \
667+
--output-path=./docs/ref/api/
668+
mv ./docs/ref/api/out.md ./docs/ref/api/v1alpha6.md
669+
658670

659671
## --------------------------------------
660672
## Kustomize

‎api/apis.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import (
1212
vmopv1a2 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
1313
vmopv1a3 "github.com/vmware-tanzu/vm-operator/api/v1alpha3"
1414
vmopv1a4 "github.com/vmware-tanzu/vm-operator/api/v1alpha4"
15-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
15+
vmopv1a5 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
16+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
1617
)
1718

1819
// AddToSchemes may be used to add all resources defined in the project to a Scheme.
@@ -32,5 +33,8 @@ func AddToScheme(s *runtime.Scheme) error {
3233
if err := vmopv1a4.AddToScheme(s); err != nil {
3334
return err
3435
}
36+
if err := vmopv1a5.AddToScheme(s); err != nil {
37+
return err
38+
}
3539
return vmopv1.AddToScheme(s)
3640
}

‎api/test/v1alpha1/conversion_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"github.com/vmware-tanzu/vm-operator/api/test/utilconversion/fuzztests"
1818
vmopv1a1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
19-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
19+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
2020
)
2121

2222
var _ = Describe("FuzzyConversion", Label("api", "fuzz"), func() {

‎api/test/v1alpha1/virtualmachine_conversion_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121

2222
"github.com/vmware-tanzu/vm-operator/api/utilconversion"
2323
vmopv1a1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
24-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
25-
vmopv1cloudinit "github.com/vmware-tanzu/vm-operator/api/v1alpha5/cloudinit"
26-
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha5/common"
27-
vmopv1sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha5/sysprep"
24+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
25+
vmopv1cloudinit "github.com/vmware-tanzu/vm-operator/api/v1alpha6/cloudinit"
26+
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha6/common"
27+
vmopv1sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha6/sysprep"
2828
)
2929

3030
func TestVirtualMachineConversion(t *testing.T) {

‎api/test/v1alpha1/virtualmachineclass_conversion_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
1717

1818
vmopv1a1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
19-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
19+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
2020
)
2121

2222
func TestVirtualMachineClassConversion(t *testing.T) {

‎api/test/v1alpha1/virtualmachineimage_conversion_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1717

1818
vmopv1a1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
19-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
20-
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha5/common"
19+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
20+
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha6/common"
2121
)
2222

2323
func TestVirtualMachineImageConversion(t *testing.T) {

‎api/test/v1alpha1/virtualmachinepublishrequest_conversion_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
1515

1616
vmopv1a1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
17-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
17+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
1818
)
1919

2020
func TestVirtualMachinePublishRequestConversion(t *testing.T) {

‎api/test/v1alpha2/conversion_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
"github.com/vmware-tanzu/vm-operator/api/test/utilconversion/fuzztests"
2020
vmopv1a2 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
21-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
22-
vmopv1sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha5/sysprep"
21+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
22+
vmopv1sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha6/sysprep"
2323
)
2424

2525
var _ = Describe("FuzzyConversion", Label("api", "fuzz"), func() {

‎api/test/v1alpha2/virtualmachine_conversion_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
vmopv1a2 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
2424
vmopv1a2common "github.com/vmware-tanzu/vm-operator/api/v1alpha2/common"
2525
vmopv1a2sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha2/sysprep"
26-
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha5"
27-
vmopv1cloudinit "github.com/vmware-tanzu/vm-operator/api/v1alpha5/cloudinit"
28-
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha5/common"
29-
vmopv1sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha5/sysprep"
26+
vmopv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha6"
27+
vmopv1cloudinit "github.com/vmware-tanzu/vm-operator/api/v1alpha6/cloudinit"
28+
vmopv1common "github.com/vmware-tanzu/vm-operator/api/v1alpha6/common"
29+
vmopv1sysprep "github.com/vmware-tanzu/vm-operator/api/v1alpha6/sysprep"
3030
)
3131

3232
func TestVirtualMachineConversion(t *testing.T) {

0 commit comments

Comments
 (0)