Skip to content

Commit 8d15d2d

Browse files
committed
address PR feedback
1 parent f8bce24 commit 8d15d2d

File tree

5 files changed

+8
-30
lines changed

5 files changed

+8
-30
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ TODO
2323

2424
vendor
2525
out
26-
certs

charts/gardener-extension-acl/templates/rbac.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ rules:
133133
- create
134134
- update
135135
- patch
136+
- delete
136137
- apiGroups:
137138
- networking.istio.io
138139
resources:

cmd/gardener-extension-acl/app/app.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ func (o *Options) run(ctx context.Context) error {
107107

108108
// TODO(Wieneo): Remove this once a couple extension versions included the migration code
109109
// migration code: remove mutating webhook from cluster as it is not served by this controller anymore
110-
if err := client.IgnoreNotFound(mgr.GetClient().Delete(ctx, &admissionregistrationv1.MutatingWebhookConfiguration{ObjectMeta: metav1.ObjectMeta{Name: ExtensionName}})); err != nil {
111-
return fmt.Errorf("could not delete mutatingwebhook %s: %s", ExtensionName, err)
110+
if err := mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
111+
if err := client.IgnoreNotFound(mgr.GetClient().Delete(ctx, &admissionregistrationv1.MutatingWebhookConfiguration{ObjectMeta: metav1.ObjectMeta{Name: ExtensionName}})); err != nil {
112+
return fmt.Errorf("could not delete mutatingwebhook %s: %s", ExtensionName, err)
113+
}
114+
return nil
115+
})); err != nil {
116+
return fmt.Errorf("could not add runnable to manager: %s", err)
112117
}
113118

114119
if err := mgr.Start(ctx); err != nil {

docs/listener-overview.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

hack/gen-certs.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)