Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup handling for disabled UseGardenerNodeAgent feature gate #920

Merged
merged 1 commit into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ spec:
- --webhook-config-server-port={{ .Values.webhookConfig.serverPort }}
- --disable-controllers={{ .Values.disableControllers | join "," }}
- --disable-webhooks={{ .Values.disableWebhooks | join "," }}
- --gardenlet-uses-gardener-node-agent={{ ternary .Values.gardener.gardenlet.featureGates.UseGardenerNodeAgent true (hasKey .Values.gardener.gardenlet.featureGates "UseGardenerNodeAgent") }}

{{- if .Values.metricsPort }}
- --metrics-bind-address=:{{ .Values.metricsPort }}
{{- end }}
Expand Down
4 changes: 0 additions & 4 deletions cmd/gardener-extension-provider-aws/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import (
"github.com/gardener/gardener-extension-provider-aws/pkg/controller/healthcheck"
awsinfrastructure "github.com/gardener/gardener-extension-provider-aws/pkg/controller/infrastructure"
awsworker "github.com/gardener/gardener-extension-provider-aws/pkg/controller/worker"
"github.com/gardener/gardener-extension-provider-aws/pkg/webhook/controlplane"
awscontrolplaneexposure "github.com/gardener/gardener-extension-provider-aws/pkg/webhook/controlplaneexposure"
)

Expand Down Expand Up @@ -241,9 +240,6 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
workerCtrlOpts.Completed().Apply(&awsworker.DefaultAddOptions.Controller)
awsworker.DefaultAddOptions.GardenCluster = gardenCluster

// TODO(KA): remove when gardener-node-agent becomes default
controlplane.NodeAgentEnabled = generalOpts.Completed().GardenletUsesGardenerNodeAgent

atomicShootWebhookConfig, err := webhookOptions.Completed().AddToManager(ctx, mgr, nil)
if err != nil {
return fmt.Errorf("could not add webhooks to manager: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: provider-aws
type: helm
providerConfig:
chart: H4sIAAAAAAAAA+09a3PbtrL9rF+Bo6TTNlNSD8t2jmZy5yi2m3raOLq2m94znY6HIiEJNUWyBClHTfPf7y4AkuBDoui4TnMOMZmYBHcXi9fuYrGAFlboUI+GBn0XUY8z3zOC0F8zB7KsO9774gFSH9Lx4aH4C6n4VzwPDkaD4eHw6AjzB4fHx6MvyOFDFF6XYh5ZISFfhL4f7YKr+/6ZpkVN/58srTAyN9bKvX8Z2MFHo9HW/h8eFPv/+HgA/d9/uGpuT//l/W8F7C0Nsd/HZD3oWEGQvnYHZr/bcSi3QxZEImtCvqfuitg4KMjcD0m0pOSVGkJk8vMVmarBQ9Lx1PGsFR2TmoHWWSfF9k0ot/Op2+W/JdXNf8e3zYX/cWXUzP9BH3RDYf73jwft/H+M1OuRq+np/xnfMZee+MEmZItldA2DYUyG/eGIXE2m5OqMwFS3PPFizefMZVZEie2vAsvbwAcnkwG270Uhm8WRH/JOr9dJ6P/IbBhe1DgHsIjNGQ1BmgSWvaTGEKY7wC388QJJIGm+JIZNujMLHp6+mlyenl2cXd58Pzn54eb0/LKXwBmiNN91YbCGdMF4BLkwhE3ENwLfMTi145BFG4N6IK5s+iII2RqquqAO0cc5McnTr20rIqbZg39vzy6vzt9cfKNe6TtrFbi0t604VI/kpWXfxsHL2L6l0RhJyowzQNmody6kKD6fSEpT1/KoyDi9uLqkth86+GaEfhzRwwNy7s1DwApjO4pDCfizH95C48FjF1uNTKEUa0GVTKaeNXMpJ7nGjIPAV/JaZTJvIUQ3FBhSOyJZxUiuYp1Ap94K5f+8VCf/IwojH0bRx6wEmtv/x8fHw9b+f4y0f//fLKkbgJFmRkHDtUCN/h+W+n8IK4LW/n+U9P69QRw6Zx4lXTTUu8T48KFTZ6wjFgW1j7AdnYRrzajLTVhGmLd0I4mJl3hGQ4/CODKZ38OCcjS2kFhbbqw4ev+eMM92Yyfl0yQKcQcjZdwig0hlTLZAqPJFSeVaMA+GjmdTgW5eUpdanJoXwFwlZylrbAUaVXJGCH5hc7K0+DSE7+9Ily+t4eHRGIp9i8VDUQhvRtaCpBhgxXjRnHS/5P/6khchQxr4nIEBttlFAupIqwiO700QKqvVu9ghAgOa1Q3gNal9Wv8c3QSKKBgJtRMkX6OUcNKnkt2kbJPk0PbiO7BiXsu2ANrJdQ5iL6ZVwTt5Lo1+hwauv1mBqa2W1elM5D1Y5Wt4DeS/qkJj8V/r/xkcHxTl/2DYb+X/Y6TSUM/NUPk8PjAH/4RF2jaJnRuo+FGtITbm7XMhKcUnoPI8R+JTV71NXzSx/0Aq8YiGsPqH/7nh+osFLCP3cQ3X2X8w8Qvz//DgsLX/HiXp/t85aCovmrHIlE84ddcDkAFgkXRumeeMyYkcBN+JQdBZ0chyrMgag2KSZtNYqKiMUDK8etEmAEOpyyl1ultgTNv1Y6cIKb3H4pPu7llZHggdMUaNbR87PKA2cqTGLD6CqWOFnIZjpXHBCLwQJcB4VlkKgKC1Z0D7wAtoUUNmK5iQitxTrDyJwphC/sqK7KVEU0bis22cPdvF9rOOYRidz6VjODOckGEDaTUR1ePsb9ABVew9U+x9dg3NPSvgSz/6e7VvwlXWrJ9aqLVp79RA//venC1WVmDYMAP8lbGK4v02huv2fwbDUUH/j44Phq3+f4xU2P9VMk509WsryMk3JYfSzjfSEaE+8sCq8oaIbLl6TURk2d+CK9w/IRO3h8gIoZNiRUmiUPYHiEgOEuhPIaSe/KM3Y16PLztSnPoh4KOFCsXdBFa0hFfy9GtYozikxzdowVqc90BygZREGUtcYgjHxzeCgOMr2UcyOi+efj2DemDtyNP3efIfvulkCHPicmK4ZSCo1SKkATF+J2sWRrHlpkjRknrpCyZqL33Cb1kQ4AaNAs+YGevUP+QwUbkxT0hpmeYsY06QtZeWhwY7tifx58SDmb5vCSwgLvNuCYemc+g6ByToDUZHfdWGHm3F/2eU7iP/xXp/Te3IDw0fLIe7kEV0hyqo8/+Mjor+n+PB4UEr/x8jVTky34qufZP0rPR+N1QT1f766qHzl6oP6bW8yY9TVCFYzq5a58lpXtdP3WUPmu4x/xtHA9b6f46L9t/waHjYzv/HSA81sR/HFpSlpFMYLQ5cwuNfvSIwcM1kFJvpwOamQi8st9UCfyDIpA2gfAWyKWIZD9MpSEtFz3YZcAqQHogQAEt2aor5yZLcsm0aYD4wFl2DIcpFQ4X095iF1CHdGvpmmQBhPMXv1vFXhZ9uQdlZbkOuNMxm7OiIKR+/B01bBTCalYsIaXmzOORRwxIFTrMyJUpeoQgbPbKdZHzAWicEhTRO7W+xcLlIpl+hCMQ0FYqZQmYVA3QLZh2LNvXYCjDhrzzUBfhMBLZJIBL5/8botx1w6VQ++k9WpJ9p2l//OxZdgRCl0UP7f0DtD0r+n8N2//dREmrfOaG/pxM4VY7ofk61KOliwClOWqkgT8VguKJRbmWQxBeUrYa8E6exjSA083NuQAElWokPnAMJtOAltPBV/6ihbydASDLIFarGvVDXnudHQv9zTSQvqX3L41WlWzRnJX0tXEzkqXmtSjFfQk2n6J/qbneqdr8RRpAMBoJyMnnu5iq1q1rQJqptMAEbPoZCn2TKJJ38fMOhDYx/9vsKeOnz6IJGd354m7r/hcvKd2lYbAsQ6PM5tP2YXPhX0DBO7GaOKEL8AFGgY8jZO8YjruHdUlBKJ8AVsy134jhA9o3nbvZDzgo9e0ftONqjTOYxYfZYzFPbJZLUlkGqkHB1mDd8C8FMZk7b+quV5Tl68/TylHsll2YKm8SrC9vsXTTWqoTKecZcaCvK9XwYoA7MyF+6F2fXN5PT1+cX3W9J9+rfVzfX56/Pur+moGvfjVf0tR97UY5ATfUxrRAJh+y4WBfNasw3akZXRH9o5La3ZynWCadmuGKeGHGvQpALUwrD2LmiUKADBuKwo9etovCtlbKTNU6+LXc6ubPk0LkVu9Fr3wFoDG4Guwasms/PqGmg/9OYsqYOgN36f3BwdFjU/wf9URv/8SipSn0rFZ/2995egD31uoiG1Z2OC88P6SXlfhzayVq0pHXD5Htx/S7Rx6SLeqqbX1g1cTJgIUu2WBrW2mKulLUbNf/NraXLzXq5hZ7aIiFdM2zT7xkurTY/shUDRXUovgQuKDueW4upzBOUspKTHcZMTVWOFAE8wkMXG9V2vusyb/FT4KRWDlJ995On6urml5b5T5k0hvyrOFyUgEWmBLuHLbWnDzqV3GXTCyMPKl3L97HEtm9vbDfKcmG5Oxjd6T27B7N7sQVti2f00v6iUchsbsqzYld2aIntRg0JNAAALWmcRuvD7KoIcu9uweBIM5uRCdCTRG0SxQI2WOBjNZmnnUEzQpgHbEW3UMfDbIqffI2meMpN56rUJ0Xb2ZMmLsYxFqe1n3CRRciAhHRd/446++E7MMabYQTxDOSAoWAaY4dsjYci90LfLs98A9AMvgR9x41CiFBkB8ZodJBRrhFGz5Omv/dCBAtmNp3YNgrHi93KR0y6reb9TrTtZmkV2DR23akPfZX3qalA6PRj3bKg7phNBmoY0pk2E8dLDRC5KDNgrRBCMxshmsM2cyl/kffwqQnFTR3bzDCvNp7NdS6zkiieW71vQQK5vhxxHvY+ZfDEb7yLvhSSxhxIvejRyO5VDwAlTHva3kKRDJYc4FHd5rzq2HUMg8AIxRng5sWkqPuXkY406aM2fg/2oJ4gnQic/51e7U9feL6blvAycZfvV8adxSIDhbYfNy7qZ8C9lqjFApfUcqOlUOfNu0ZDruscAA2jGbUiIzWjX2yzoskWTCBO7wwRn7O2XDwAjyvlHcxJPFPgnSs0tb4uFcNy59Gbt0Uev645pGFvSF8OSorMetxagEB5k2BMUoQi7TtxjL55DSReHed3dAb68zYRQfW9uQtbqUAD7R6dLQUmdyhNBaVsoDp6GO5bS46GVdQcxtFu1OKpc42lPmc7qBzMgd/AyCPdb7vbaKmyqwj9rD7toCLVqAt6MeaUG6lW9XwHjJcFdBLShZHtWdoRxtTuSdHNOUwEGJev0N9h/sRpcqvFBRCaIB3hCiVfLy3+A92bEulWkQKjHU/tJfUorIHyFm2utuqTMQMby7AcByw5/mK81RretUDJZNt2avJ7FSNpO6szhnrnpU2ivum41FuX/XQ/nk1Ozy5vzn48O7k+f3NxczF5fXY1nZycaW43cRz3O1gL5F12c0Zd55LO87kqXzotk2Womc7E+y4+E37PX09enb0FZt9c3rx5e3b58+X5dYnXMemJizO08KNeZTzSrk5y2RpakvNp6M+oXsdlFAWvaJSvdiCdtLLX/sh/Euum2q7FxEFdYS2/v76e6p5bj0XMck+pa21SF+ygn0KE1HJYY14Ra/MorB529AIqvMWJpFTunIxcuqqYFjnbR2yKFWzk2747Jtcn0+Leepj3fCVtqTLHFbvsGcafxFNrrUG/IqwAU7XfP6myVAoaq7qvv9Zq/thptC0esIqZ0lTS4HAM4c5RbrOqYjrh7UUehkJoI8GZwDp/UvpA0qiO0ziEJbPa2YKnc2FkqGy596RF98jqicXwVc6Lp9UK/Xln7wIUtnlXWIIuNsbq7i0oYOm7Xude6aOQSKWisLA9bj/QESI/8F1/sfkBeezm70TAfUMxSKr3ZbYMusq9mL3DzZKU25MZDROx1Ghk7jcum/NbN8538P7XBsvsv/8DEwVMsjAWVwHOYmdB990Iqov/PuoX479Hx2389+Mkff8nEE6rbAdo6junaY+/FD3+0FtBzXZoEi9icedi8PE7JkpKcLpaY9DnKrBCgP6fF2RgDo+MPiCcaPvv5g8g9VS7mW91Ezf2pKmygcY7gwUZNl3iKZy4d9aGT9B1+rcJg9t//oczy77fRbA18380GBTvfxocHrX3Pz5KKp6AFr1sxdHSD9kf8hJAdYlHFh0uT0Bf+i5tIg6aTPQwdtFoMDCq+1Xox4E62qzFcue3LTo5gxlBdY83L+f0oNujWP+APmuY2uWcPKhwPedfdAB1S4Z60Zy/FTk6XuqVLL7qQHn3WWWeDi59Vbnn7DOIuZlqKpTrwmZlXD7cofTsyLPkyVMs9o7LXbJtI6ncI/J6AyfNzTPRfdYtE7d9aAIV/qPGYZmuUCsFajYsCISBJWtFsmqRjy0lyRd6TJ241ySmAYD4KNQRnhkQLVyWsqnnlVR3xrb27nbFH4zVUIMw6aGtU1ciOCsmVhu5Cz51gIBp00v7oO0abmucVNXzwmsPVlWWi6FX8gvYwJ6ajpxCJ0XptJDmvIJS28JqLqSBKKX3Hrctlypywv/J9RdL7hrmZibMPlrKQO8X1E/mZxClT7/5M/kAxnD20JNXK8AIjyNxt6ryCdj62RFVpggsS1pPXKDEsq+qpYUdxvaaICvLXjKPmtwKxKyr7B3ErCcFI8fH5tzVz0BDhGpCrRNw2bN1xKVpWSZYsajYPpObyCk5UFyKU+ijVNxL2f9/maaDIpTvMmmyHRx20gNKmg6u4YfHs99AFAl1KpGvcnvqD2PIf2o7pk33S/vb/0qm3mMJUGP/Hxwdl+9/Hbbxn4+SKs9/KgHx8Iv9UvjfPhFJ89Bf4X6t6xgY5SQ89+SrX953E6d6d9y9Ppl2v+3it+54P+f8h1+/asaBiIqi1DFkdJsBwwa1laFCoXKMFfnIb8l9W+T8XrwkexW7+HisBkp730jcMIoDzQ8D5RacxbldOeBREu1CA5UQC+Wh1gQEEaTWbcQp/iiA0MUpp9nuPDQhw8jczAzuVDmQq6KV9w9PLrh1KwrIn8BCnxc8RWhXcjPxvU/uLODBjzFXBXIWyVW6so4buLLS4LvCvccJD8ZKeKu7aAlq9dIutK3Bt7ASxhIN/TKZfPNor0/I9ZvTN2NyvWRcmlq4GAp9sITxKC6sDmDlDBrLEUGvnk9c31vQEEYH2NsORpriLx/MYxGBQi7pyl9TzFoRixPuQ+3hb3prW/Lwr/XAPD7Ee5rJjFIPulsIOMdsNnGlHWyUR6EIqaySL/ei/2AyqWn8/AMP5WQhaHAXI2DEUNneArDe4mi4bJtriftYhuwrE/ocd40z5/F+0fXp9rFR3qquDcvJ7wWLHTXR1Y22lh9K/ze2/9SauokZWLf/c9Av3v8KJmHr/32UtMv+SxaIn3TPB9WCiALIM3Xt31K8sNMCddMuPu+fGsx/eUmEuGGi2SKwZv4P+ofHxfl/0O7/Pk5SCrvBBQC6xEguDin6z65kvjjhUS0+Glxi0swG2f/coHQPGjDimbcG098xpO8wNR+EFfVWRLCcvQssT9ZZBBiJZsF3tDZqqqPBIosyJEa5FWXARw2BEgaSAaseWii59VeaNIvgoFOywaooUs8ON0GUGFrpq2Y5Vf80xqcerm164LS//F8H1j1/B7ZO/g+Oive/DUajo1b+P0YqCAvsZG0NljsdXtofyuT9W7UvNPWdSbovtP/lcVDqnrZjsoSrYDuR8/rRu3ye1AdaKK/cZpPZRvZBnjL86pn0KhGyYt5ELqizeL8VXfnhZst9YWV2zIyGKVGrrw3bC/ND4SeXkgVkGgNfdagf80sH++viFgFA6kS9AWVOSXMh6zqwmcG1SuRvm+rkv4wa/rgfAK+L/8LLPvLyvz9o478eJ8lTz0JUJj/yNiY0Dv2AGo5v41m34HZhOnSdnVaGAYI7yj15XD3N72V+817hGHNkLcZEmBEocwLt9PT5/MKPpvhrEyCOOvJwDIiVD50nIMbkr09hyMsTIq8REi8d/b4MjP4sx4NmF1Uc9r9EhCTqAEmDpBoLq1foufTIQJWyKIv+RPAfjV6zWvHYnQindkfztY7J8/7zfic70CIyBp2Odp4OCenRaqni0s8cyuMs2nnrnVA8O6JQCaEHpu0AS+PSdsAQUjolLEN0ix9eyis3q3C0w7hjMsQhlI9z21G8jHTbAaAdyN0NJeOzxkQtI8vnY8fkoI9ft546TRxUnfKpyDH55ddO4YyjyCvsL6UknpCqowt4DS5MDnXN9Vg85y7eMlKzRnwjRNK91Kb7gkXLeAYLxVUv26nRH2euP+utLHSX92Yxcx35i269UyEg8IC9oq0LkYUdoo248P2FS2+yaxkkrmGtnKORQhPioXtg9rsqY51YLwNzMDDffd61GpRqJTfjBkP5wTTNTifn65fXGaYbB2MyGh2orOQE2qA/POzDoHhCkg0V8QMYStB8S6i5MAlP7naZbYjYWsouUgHMRCphaUBHisP0apYEV3xMpWVyW4wSmh075bf6suOqq47BIkXpjUC937jvpVZ5eu1wJYS4EHigLgZRt/UODvA1uzu3cHOuXb5hRPp+jLnFowQovR33ef8VU5k5/05++xJjPOksuZyjwpuDsus7P/yOAYtQcw7fk6OEmqNFtl/C1rijDw/0v6RniWVl9APFQokR0aPjnOwUN1/LhtDuW0kGSLZ4qdp6048ypZqxda+3qU1talOb2tSmNrWpTW1qU5va1KY2talNbWpTm9r0Oab/B2fuWPgAoAAA
chart: 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
values:
image:
tag: v1.54.0-dev
Expand Down
4 changes: 1 addition & 3 deletions pkg/webhook/controlplane/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import (

var (
logger = log.Log.WithName("aws-controlplane-webhook")
// NodeAgentEnabled indicates whether the gardener node-agent feature flag is enabled in gardenlet.
NodeAgentEnabled bool
)

// AddToManager creates a webhook and adds it to the manager.
Expand All @@ -37,7 +35,7 @@ func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
{Obj: &vpaautoscalingv1.VerticalPodAutoscaler{}},
{Obj: &extensionsv1alpha1.OperatingSystemConfig{}},
},
Mutator: genericmutator.NewMutator(mgr, NewEnsurer(logger, mgr.GetClient(), NodeAgentEnabled), oscutils.NewUnitSerializer(),
Mutator: genericmutator.NewMutator(mgr, NewEnsurer(logger, mgr.GetClient()), oscutils.NewUnitSerializer(),
kubelet.NewConfigCodec(fciCodec), fciCodec, logger),
})
}
17 changes: 7 additions & 10 deletions pkg/webhook/controlplane/ensurer.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,17 @@ const (
)

// NewEnsurer creates a new controlplane ensurer.
func NewEnsurer(logger logr.Logger, client client.Client, nodeAgentEnabled bool) genericmutator.Ensurer {
func NewEnsurer(logger logr.Logger, client client.Client) genericmutator.Ensurer {
return &ensurer{
logger: logger.WithName("aws-controlplane-ensurer"),
client: client,
nodeAgentEnabled: nodeAgentEnabled,
logger: logger.WithName("aws-controlplane-ensurer"),
client: client,
}
}

type ensurer struct {
genericmutator.NoopEnsurer
logger logr.Logger
client client.Client
nodeAgentEnabled bool
logger logr.Logger
client client.Client
}

// ImageVector is exposed for testing.
Expand Down Expand Up @@ -350,8 +348,7 @@ func (e *ensurer) EnsureKubeletServiceUnitOptions(ctx context.Context, gctx gcon
return nil, err
}

// the ECR feature only works with node agent.
if e.nodeAgentEnabled && k8sGreaterEqual127 {
if k8sGreaterEqual127 {
infra := &extensionsv1alpha1.Infrastructure{}
if err := e.client.Get(ctx, client.ObjectKey{
Namespace: cluster.ObjectMeta.Name,
Expand Down Expand Up @@ -569,7 +566,7 @@ func (e *ensurer) EnsureAdditionalFiles(ctx context.Context, gctx gcontext.Garde
}

// return early
if !(e.nodeAgentEnabled && k8sGreaterEqual127) {
if !k8sGreaterEqual127 {
return nil
}

Expand Down
Loading
Loading