Skip to content

Commit 2c7f7fa

Browse files
committed
update tests and regenerate code for v1beta2
Signed-off-by: Bharath Nallapeta <nr.bharath97@gmail.com>
1 parent f1a16cc commit 2c7f7fa

File tree

126 files changed

+12956
-373
lines changed

Some content is hidden

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

126 files changed

+12956
-373
lines changed

Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ generate-controller-gen: $(CONTROLLER_GEN)
328328
generate-codegen: generate-controller-gen $(OPENAPI_GEN) $(APPLYCONFIGURATION_GEN) $(CLIENT_GEN) $(LISTER_GEN) $(INFORMER_GEN)
329329
@echo "** Generating OpenAPI definitions **"
330330
# The package list includes:
331-
# - CAPO's own API packages (v1alpha1, v1beta1) that have // +k8s:openapi-gen= markers
331+
# - CAPO's own API packages (v1alpha1, v1beta1, v1beta2) that have // +k8s:openapi-gen= markers
332332
# - Dependency packages from CAPI and k8s.io that are referenced by CAPO's APIs
333333
# - Base k8s.io/apimachinery packages
334334
$(OPENAPI_GEN) \
@@ -339,6 +339,7 @@ generate-codegen: generate-controller-gen $(OPENAPI_GEN) $(APPLYCONFIGURATION_GE
339339
--report-filename=./api_violations.report \
340340
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1 \
341341
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 \
342+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2 \
342343
sigs.k8s.io/cluster-api/api/core/v1beta2 \
343344
sigs.k8s.io/cluster-api/api/ipam/v1beta2 \
344345
sigs.k8s.io/cluster-api/api/core/v1beta1 \
@@ -357,7 +358,8 @@ generate-codegen: generate-controller-gen $(OPENAPI_GEN) $(APPLYCONFIGURATION_GE
357358
--output-pkg=sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/applyconfiguration \
358359
--openapi-schema=./openapi.json \
359360
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1 \
360-
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
361+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 \
362+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2
361363
@echo "** Generating clientset code **"
362364
$(CLIENT_GEN) \
363365
--go-header-file=./hack/boilerplate.go.txt \
@@ -367,14 +369,16 @@ generate-codegen: generate-controller-gen $(OPENAPI_GEN) $(APPLYCONFIGURATION_GE
367369
--input-base=sigs.k8s.io/cluster-api-provider-openstack \
368370
--apply-configuration-package=sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/applyconfiguration \
369371
--input=api/v1alpha1 \
370-
--input=api/v1beta1
372+
--input=api/v1beta1 \
373+
--input=api/v1beta2
371374
@echo "** Generating lister code **"
372375
$(LISTER_GEN) \
373376
--go-header-file=./hack/boilerplate.go.txt \
374377
--output-dir=./pkg/generated/listers \
375378
--output-pkg=sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/listers \
376379
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1 \
377-
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
380+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 \
381+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2
378382
@echo "** Generating informer code **"
379383
$(INFORMER_GEN) \
380384
--go-header-file=./hack/boilerplate.go.txt \
@@ -383,7 +387,8 @@ generate-codegen: generate-controller-gen $(OPENAPI_GEN) $(APPLYCONFIGURATION_GE
383387
--versioned-clientset-package=sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/clientset/clientset \
384388
--listers-package=sigs.k8s.io/cluster-api-provider-openstack/pkg/generated/listers \
385389
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1 \
386-
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
390+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 \
391+
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta2
387392

388393
.PHONY: generate-manifests
389394
generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.

cmd/models-schema/zz_generated.openapi.go

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml

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

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackservers.yaml

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

0 commit comments

Comments
 (0)