diff --git a/charts/gardener/gardenlet/templates/clusterrole-gardenlet.yaml b/charts/gardener/gardenlet/templates/clusterrole-gardenlet.yaml index 26fc41915de..b226b3915d4 100644 --- a/charts/gardener/gardenlet/templates/clusterrole-gardenlet.yaml +++ b/charts/gardener/gardenlet/templates/clusterrole-gardenlet.yaml @@ -177,13 +177,6 @@ rules: - filters.fluentbit.fluent.io - outputs.fluentbit.fluent.io - parsers.fluentbit.fluent.io - # TODO(rfranzke): Remove this code after Gardener v1.83 has been released. - - alicloudmachineclasses.machine.sapcloud.io - - awsmachineclasses.machine.sapcloud.io - - azuremachineclasses.machine.sapcloud.io - - gcpmachineclasses.machine.sapcloud.io - - openstackmachineclasses.machine.sapcloud.io - - packetmachineclasses.machine.sapcloud.io verbs: - delete - apiGroups: diff --git a/pkg/component/machinecontrollermanager/crd.go b/pkg/component/machinecontrollermanager/crd.go index b04da536ccd..f0e1b16afd2 100644 --- a/pkg/component/machinecontrollermanager/crd.go +++ b/pkg/component/machinecontrollermanager/crd.go @@ -19,14 +19,11 @@ import ( _ "embed" "fmt" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/gardener/gardener/pkg/client/kubernetes" "github.com/gardener/gardener/pkg/component" gardenerutils "github.com/gardener/gardener/pkg/utils/gardener" - kubernetesutils "github.com/gardener/gardener/pkg/utils/kubernetes" ) var ( @@ -72,7 +69,7 @@ func (c *crd) Deploy(ctx context.Context) error { } } - return c.deleteLegacyCRDs(ctx) + return nil } func (c *crd) Destroy(ctx context.Context) error { @@ -93,27 +90,5 @@ func (c *crd) Destroy(ctx context.Context) error { } } - return c.deleteLegacyCRDs(ctx) -} - -// TODO(rfranzke): Remove this code after Gardener v1.83 has been released. -func (c *crd) deleteLegacyCRDs(ctx context.Context) error { - for _, name := range []string{ - "alicloudmachineclasses.machine.sapcloud.io", - "awsmachineclasses.machine.sapcloud.io", - "azuremachineclasses.machine.sapcloud.io", - "gcpmachineclasses.machine.sapcloud.io", - "openstackmachineclasses.machine.sapcloud.io", - "packetmachineclasses.machine.sapcloud.io", - } { - obj := &apiextensionsv1.CustomResourceDefinition{ObjectMeta: metav1.ObjectMeta{Name: name}} - if err := gardenerutils.ConfirmDeletion(ctx, c.client, obj); client.IgnoreNotFound(err) != nil { - return err - } - if err := kubernetesutils.DeleteObject(ctx, c.client, obj); err != nil { - return err - } - } - return nil } diff --git a/pkg/gardenlet/controller/managedseed/charttest/charttest.go b/pkg/gardenlet/controller/managedseed/charttest/charttest.go index 95067e40313..9a1676f3b0d 100644 --- a/pkg/gardenlet/controller/managedseed/charttest/charttest.go +++ b/pkg/gardenlet/controller/managedseed/charttest/charttest.go @@ -279,13 +279,6 @@ func getGardenletClusterRole(labels map[string]string) *rbacv1.ClusterRole { "filters.fluentbit.fluent.io", "outputs.fluentbit.fluent.io", "parsers.fluentbit.fluent.io", - // TODO(rfranzke): Remove this code after Gardener v1.83 has been released. - "alicloudmachineclasses.machine.sapcloud.io", - "awsmachineclasses.machine.sapcloud.io", - "azuremachineclasses.machine.sapcloud.io", - "gcpmachineclasses.machine.sapcloud.io", - "openstackmachineclasses.machine.sapcloud.io", - "packetmachineclasses.machine.sapcloud.io", }, Verbs: []string{"delete"}, },