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.

Sign up for GitHub

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

Jump to bottom

[release-v0.45.x] Make sure we pass the live config to the conversion webhook #6462

Merged
merged 1 commit into from
Mar 30, 2023
Merged

[release-v0.45.x] Make sure we pass the live config to the conversion webhook #6462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion cmd/webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ func newConversionController(ctx context.Context, cmw configmap.Watcher) *contro
resolutionv1alpha1GroupVersion = resolutionv1alpha1.SchemeGroupVersion.Version
resolutionv1beta1GroupVersion = resolutionv1beta1.SchemeGroupVersion.Version
)
// Decorate contexts with the current state of the config.
store := defaultconfig.NewStore(logging.FromContext(ctx).Named("config-store"))
store.WatchConfigs(cmw)
return conversion.NewConversionController(ctx,
// The path on which to serve the webhook
"/resource-conversion",
Expand Down Expand Up @@ -211,7 +214,7 @@ func newConversionController(ctx context.Context, cmw configmap.Watcher) *contro

// A function that infuses the context passed to ConvertTo/ConvertFrom/SetDefaults with custom metadata
func(ctx context.Context) context.Context {
return ctx
return store.ToContext(ctx)
},
)
}
Expand Down