Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fad32bc

Browse files
committedMay 29, 2024··
Fixup
1 parent 844f5a5 commit fad32bc

4 files changed

+91
-24
lines changed
 

‎Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,14 @@ config/.flag.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS)
158158
$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="{./api/...,./controllers/...}" output:crd:artifacts:config=config/crd/bases
159159
@touch config/.flag.mk
160160

161-
CONVERSION_GEN_TARGET=$(shell find api -type d -name "v*1" -exec echo {}\/zz_generated.conversion.go \;)
162161
.PHONY: generate-conversion
163162
generate-conversion: $(CONVERSION_GEN) ## Generate code to convert api/v1beta1 and api/v1beta2 to api/v1beta3
164163
$(CONVERSION_GEN) \
165164
--input-dirs=./api/v1beta1 \
165+
--go-header-file=./hack/boilerplate.go.txt \
166+
--output-base=. --output-file-base=zz_generated.conversion
167+
$(CONVERSION_GEN) \
166168
--input-dirs=./api/v1beta2 \
167-
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
168169
--go-header-file=./hack/boilerplate.go.txt \
169170
--output-base=. --output-file-base=zz_generated.conversion
170171

‎api/v1beta1/zz_generated.conversion.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1beta2/cloudstackfailuredomain_conversion.go

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package v1beta2
1818

1919
import (
20+
machineryconversion "k8s.io/apimachinery/pkg/conversion"
2021
"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
2122
"sigs.k8s.io/controller-runtime/pkg/conversion"
2223
)
@@ -30,3 +31,7 @@ func (dst *CloudStackFailureDomain) ConvertFrom(srcRaw conversion.Hub) error { /
3031
src := srcRaw.(*v1beta3.CloudStackFailureDomain)
3132
return Convert_v1beta3_CloudStackFailureDomain_To_v1beta2_CloudStackFailureDomain(src, dst, nil)
3233
}
34+
35+
func Convert_v1beta3_CloudStackFailureDomainSpec_To_v1beta2_CloudStackFailureDomainSpec(in *v1beta3.CloudStackFailureDomainSpec, out *CloudStackFailureDomainSpec, s machineryconversion.Scope) error { // nolint
36+
return autoConvert_v1beta3_CloudStackFailureDomainSpec_To_v1beta2_CloudStackFailureDomainSpec(in, out, s)
37+
}

‎api/v1beta2/zz_generated.conversion.go

+81-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.