Merge pull request #1226 from alvaroaleman/fix

🌱 Fix AC generation so it builds and test all submodules

Author: k8s-ci-robot

pkg/applyconfiguration/testdata/cronjob/api/v1/applyconfiguration/api/v1/cronjobspec.go

@@ -294,8 +294,10 @@ type CronJobSpec struct {
 	unexportedField string
 
 	// This tests that both unexported and exported inline fields are not skipped in the schema generation
-	unexportedStruct `json:",inline"`
-	ExportedStruct   `json:",inline"`
+	//
+	// This currently does not work
+	//unexportedStruct `json:",inline"`
+	ExportedStruct `json:",inline"`
 
 	// Test of the expression-based validation rule marker, with optional message.
 	// +kubebuilder:validation:XValidation:rule="self.size() % 2 == 0",message="must have even length"
@@ -363,11 +365,13 @@ type CronJobSpec struct {
 	// This tests that a slice of IntOrString can also have string validation.
 	// This can be useful if you want to limit the string to a percentage or integer.
 	// The XIntOrString marker is a requirement for having a pattern on this type.
-	// +kubebuilder:validation:items:XIntOrString
-	// +kubebuilder:validation:items:MaxLength=10
-	// +kubebuilder:validation:items:MinLength=1
-	// +kubebuilder:validation:items:Pattern="^((100|[0-9]{1,2})%|[0-9]+)$"
-	IntOrStringArrayWithAPattern []*intstr.IntOrString `json:"intOrStringArrayWithAPattern,omitempty"`
+	// -+kubebuilder:validation:items:XIntOrString
+	// -+kubebuilder:validation:items:MaxLength=10
+	// -+kubebuilder:validation:items:MinLength=1
+	// -+kubebuilder:validation:items:Pattern="^((100|[0-9]{1,2})%|[0-9]+)$"
+	//
+	// This currently does not work. Remove the leading '-' in the above markers when fixing.
+	// IntOrStringArrayWithAPattern []*intstr.IntOrString `json:"intOrStringArrayWithAPattern,omitempty"`
 
 	// This tests that we can embed protocol correctly (without ending up with allOf).
 	// Context: https://github.com/kubernetes-sigs/controller-tools/issues/1027

pkg/applyconfiguration/testdata/cronjob/api/v1/applyconfiguration/api/v1/unexportedstruct.go

@@ -27,9 +27,10 @@ import (
 )
 
 var (
-	GroupName     = "testdata.kubebuilder.io"
-	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: "v1"}
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	GroupName          = "testdata.kubebuilder.io"
+	GroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
+	SchemeGroupVersion = GroupVersion
+	SchemeBuilder      = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme exists solely to keep the old generators creating valid code
 	AddToScheme = SchemeBuilder.AddToScheme

pkg/applyconfiguration/testdata/cronjob/api/v1/applyconfiguration/utils.go

@@ -72,7 +72,3 @@ type CronJobList struct {
 	metav1.ListMeta
 	Items []CronJob
 }
-
-func init() {
-	SchemeBuilder.Register(&CronJob{}, &CronJobList{})
-}

pkg/applyconfiguration/testdata/cronjob/api/v1/cronjob_types.go

@@ -119,4 +119,14 @@ make lint
 
 header_text "running go test"
 
-go test -race ./pkg/... ./cmd/... -parallel 4
+for dir in $(find . -name go.mod -exec dirname {} \;); do
+  # Includes "BadDeepCopy" types that are not supposed to result in
+  # valid code generation
+  if [[ "$dir" == "./pkg/deepcopy/testdata" ]]; then continue; fi
+
+  # https://github.com/kubernetes-sigs/controller-tools/issues/1227
+  if [[ "$dir" == "./pkg/webhook/testdata" ]]; then continue; fi
+
+  echo "Testing module in $dir"
+  (cd "$dir" && go test -race ./... -parallel 4)
+done