From ee0cf78dbc9af7b0a221a1ef307c15e56af206dc Mon Sep 17 00:00:00 2001 From: Rafael Franzke Date: Mon, 24 Oct 2022 13:04:45 +0200 Subject: [PATCH] Cleanup legacy `gardener-resource-manager-server` secret deletion --- .../botanist/component/resourcemanager/resource_manager.go | 3 +-- .../component/resourcemanager/resource_manager_test.go | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/operation/botanist/component/resourcemanager/resource_manager.go b/pkg/operation/botanist/component/resourcemanager/resource_manager.go index e1850434b46..508542fc87b 100644 --- a/pkg/operation/botanist/component/resourcemanager/resource_manager.go +++ b/pkg/operation/botanist/component/resourcemanager/resource_manager.go @@ -279,8 +279,7 @@ func (r *resourceManager) Deploy(ctx context.Context) error { } } - // TODO(rfranzke): Remove in a future release. - return kutil.DeleteObject(ctx, r.client, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "gardener-resource-manager-server", Namespace: r.namespace}}) + return nil } func (r *resourceManager) Destroy(ctx context.Context) error { diff --git a/pkg/operation/botanist/component/resourcemanager/resource_manager_test.go b/pkg/operation/botanist/component/resourcemanager/resource_manager_test.go index fdbc4bd9ceb..b74444509ce 100644 --- a/pkg/operation/botanist/component/resourcemanager/resource_manager_test.go +++ b/pkg/operation/botanist/component/resourcemanager/resource_manager_test.go @@ -1118,7 +1118,6 @@ subjects: Do(func(ctx context.Context, obj runtime.Object, _ client.Patch, _ ...client.PatchOption) { Expect(obj).To(DeepEqual(networkPolicy)) }), - c.EXPECT().Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: deployNamespace, Name: "gardener-resource-manager-server"}}), ) }) Context("Kubernetes version >= 1.21", func() { @@ -1222,7 +1221,6 @@ subjects: Do(func(ctx context.Context, obj runtime.Object, _ client.Patch, _ ...client.PatchOption) { Expect(obj).To(DeepEqual(networkPolicy)) }), - c.EXPECT().Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: deployNamespace, Name: "gardener-resource-manager-server"}}), ) }) Context("Kubernetes version >= 1.21", func() { @@ -1324,7 +1322,6 @@ subjects: Do(func(ctx context.Context, obj runtime.Object, _ client.Patch, _ ...client.PatchOption) { Expect(obj).To(DeepEqual(networkPolicy)) }), - c.EXPECT().Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: deployNamespace, Name: "gardener-resource-manager-server"}}), ) Expect(resourceManager.Deploy(ctx)).To(Succeed()) }) @@ -1437,7 +1434,6 @@ subjects: Do(func(ctx context.Context, obj runtime.Object, _ client.Patch, _ ...client.PatchOption) { Expect(obj).To(DeepEqual(mutatingWebhookConfiguration)) }), - c.EXPECT().Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: deployNamespace, Name: "gardener-resource-manager-server"}}), ) Expect(resourceManager.Deploy(ctx)).To(Succeed()) })