Merge pull request #1345 from alvaroaleman/fix-bump

🌱 fix and test webhook testdata compilation

Author: k8s-ci-robot

pkg/loader/loader.go

@@ -290,7 +290,10 @@ func (l *loader) typeCheck(pkg *Package) {
 	illTyped := len(errs) > 0
 	if !illTyped {
 		for _, importedPkg := range pkg.Imports() {
-			if importedPkg.IllTyped {
+			importedPkg.Lock()
+			isIllTyped := importedPkg.IllTyped
+			importedPkg.Unlock()
+			if isIllTyped {
 				illTyped = true
 				break
 			}

pkg/webhook/testdata/cronjob_types.go

@@ -1,9 +1,3 @@
 module testdata.kubebuilder.io/cronjob
 
-go 1.15
-
-require (
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
-	sigs.k8s.io/controller-runtime v0.7.0
-)
+go 1.25.0

pkg/webhook/testdata/go.mod

@@ -15,36 +15,6 @@ limitations under the License.
 
 package cronjob
 
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
-)
-
-func (c *CronJob) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr).
-		For(c).
-		Complete()
-}
-
 // +kubebuilder:webhook:webhookVersions=v1,verbs=create;update,path=/validate-testdata-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=testdata.kubebuilder.io,resources=cronjobs,versions=v1,name=validation.cronjob.testdata.kubebuilder.io,sideEffects=None,timeoutSeconds=10
 // +kubebuilder:webhook:verbs=create;update,path=/validate-testdata-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=testdata.kubebuilder.io,resources=cronjobs,versions=v1,name=validation.cronjob.testdata.kubebuilder.io,sideEffects=NoneOnDryRun,timeoutSeconds=10,admissionReviewVersions=v1;v1beta1
 // +kubebuilder:webhook:webhookVersions=v1,verbs=create;update,path=/mutate-testdata-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=testdata.kubebuilder.io,resources=cronjobs,versions=v1,name=default.cronjob.testdata.kubebuilder.io,sideEffects=None,timeoutSeconds=10,admissionReviewVersions=v1;v1beta1
-
-var _ webhook.Defaulter = &CronJob{}
-var _ webhook.Validator = &CronJob{}
-
-func (c *CronJob) Default() {
-}
-
-func (c *CronJob) ValidateCreate() error {
-	return nil
-}
-
-func (c *CronJob) ValidateUpdate(_ runtime.Object) error {
-	return nil
-}
-
-func (c *CronJob) ValidateDelete() error {
-	return nil
-}

pkg/webhook/testdata/go.sum

@@ -15,38 +15,8 @@ limitations under the License.
 
 package cronjob
 
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
-)
-
-func (c *CronJob) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr).
-		For(c).
-		Complete()
-}
-
 // +kubebuilder:webhook:webhookVersions=v1,verbs=create;update,path=/validate-testdata-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=testdata.kubebuilder.io,resources=cronjobs,versions=v1,name=validation.cronjob.testdata.kubebuilder.io,sideEffects=None,timeoutSeconds=10,admissionReviewVersions=v1;v1beta1
 // +kubebuilder:webhook:verbs=create;update,path=/validate-testdata-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=testdata.kubebuilder.io,resources=cronjobs,versions=v1,name=validation.cronjob.testdata.kubebuilder.io,sideEffects=NoneOnDryRun,timeoutSeconds=10,admissionReviewVersions=v1;v1beta1
 // +kubebuilder:webhook:webhookVersions=v1,verbs=create;update,path=/mutate-testdata-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=testdata.kubebuilder.io,resources=cronjobs,versions=v1,name=default.cronjob.testdata.kubebuilder.io,sideEffects=None,timeoutSeconds=10,admissionReviewVersions=v1;v1beta1,reinvocationPolicy=IfNeeded
 // +kubebuilder:webhookconfiguration:mutating=true,name=foo
 // +kubebuilder:webhookconfiguration:mutating=true,name=bar
-
-var _ webhook.Defaulter = &CronJob{}
-var _ webhook.Validator = &CronJob{}
-
-func (c *CronJob) Default() {
-}
-
-func (c *CronJob) ValidateCreate() error {
-	return nil
-}
-
-func (c *CronJob) ValidateUpdate(_ runtime.Object) error {
-	return nil
-}
-
-func (c *CronJob) ValidateDelete() error {
-	return nil
-}