[DNM][main] Rework webhook TLS and RBAC: replace dynamiclistener, bake WebhookConfigurations#1502
Draft
crobby wants to merge 8 commits into
Draft
[DNM][main] Rework webhook TLS and RBAC: replace dynamiclistener, bake WebhookConfigurations#1502crobby wants to merge 8 commits into
crobby wants to merge 8 commits into
Conversation
Remove leader election, secretHandler, ensureWebhookConfiguration, and dynamiclistener dependency. The webhook now reads serving certs from mounted files (/tmp/k8s-webhook-server/serving-certs/) populated by needacert via a projected Secret volume. Cert rotation is handled by re-reading the files on each TLS handshake. WebhookConfiguration ownership has moved to the rancher-webhook Helm chart.
NewErrorChecker initializes with a not-ready error. The old secretHandler.sync() cleared it; with that gone the health endpoint returned 500 permanently. Clear the error after the serving cert is successfully loaded, just before ListenAndServeTLS.
Full ValidatingWebhookConfiguration (31 entries) and MutatingWebhookConfiguration (9 entries) with per-entry failurePolicy preserved. MCM-only entries gated on .Values.mcm.enabled. Service annotated for needacert, deployment mounts cattle-webhook-tls secret at /tmp/k8s-webhook-server/serving-certs.
Replaces the cluster-admin ClusterRoleBinding with a scoped ClusterRole + renamed ClusterRoleBinding (rancher-webhook-binding). Helm will prune the old rancher-webhook CRB on upgrade since roleRef is immutable. Enumerates built-in rke-machine types; custom node drivers will need a chart update to add their machine resource.
ListenAndServeTLS blocks, so clients.Start (which starts informer caches) never ran. Validators that read from caches (cluster lookups, RBAC checks, etc.) silently returned empty results. Move the listener into a goroutine, start clients after, and block on ctx.Done.
This was referenced May 26, 2026
crobby
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The webhook currently uses dynamiclistener for TLS certificate management and ships with a
cluster-adminClusterRoleBinding. This is more privilege than necessary and dynamiclistener adds complexity that can be replaced with simpler file-based TLS.Solution
Related PRs
[DNM] Webhook config reworking(this PR extracts and supersedes the webhook-side changes)Testing