diff --git a/pkg/admission/validator/shoot.go b/pkg/admission/validator/shoot.go index 291e5f6e..800cc3e5 100644 --- a/pkg/admission/validator/shoot.go +++ b/pkg/admission/validator/shoot.go @@ -9,7 +9,6 @@ import ( apismetal "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal" "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/helper" metalvalidation "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/validation" - "github.com/metal-stack/metal-lib/pkg/tag" extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook" "github.com/gardener/gardener/pkg/apis/core" @@ -56,11 +55,6 @@ func (s *shoot) validateShoot(ctx context.Context, shoot *core.Shoot) error { // Provider validation fldPath := field.NewPath("spec", "provider") - _, ok := shoot.Annotations[tag.ClusterTenant] - if !ok { - return field.Required(field.NewPath("metadata", "annotations"), fmt.Sprintf("cluster must be annotated with a tenant using the annotations: %s", tag.ClusterTenant)) - } - // InfrastructureConfig infraConfigFldPath := fldPath.Child("infrastructureConfig") @@ -152,10 +146,6 @@ func (s *shoot) validateShootUpdate(ctx context.Context, oldShoot, shoot *core.S } } - if shoot.Annotations[tag.ClusterTenant] != oldShoot.Annotations[tag.ClusterTenant] { - return field.Forbidden(field.NewPath("metadata", "annotations"), "tenant annotation of a shoot is immutable") - } - return s.validateShoot(ctx, shoot) }