Skip to content

feat: Added ownerRef to agent created webhook config. #346

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

Merged
ryanzhang-oss merged 3 commits into from
Dec 6, 2022
Merged

feat: Added ownerRef to agent created webhook config. #346

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5111838
Bound the agent created webhook config to the fleet-system namespace.
Nov 29, 2022
8e4a6cb
Error handling.
Nov 29, 2022
9f6ba7d
Added comments.
Dec 2, 2022
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
26 changes: 26 additions & 0 deletions pkg/webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"

fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1"
Expand Down Expand Up @@ -180,6 +181,12 @@ func (w *Config) createFleetWebhookConfiguration(ctx context.Context) error {
},
}

// We need to ensure this webhook configuration is garbage collected if Fleet is uninstalled from the cluster.
// Since the fleet-system namespace is a prerequisite for core Fleet components, we bind to this namespace.
if err := bindWebhookConfigToFleetSystem(ctx, w.mgr.GetClient(), &whCfg); err != nil {
return err
}

if err := w.mgr.GetClient().Create(ctx, &whCfg); err != nil {
if !apierrors.IsAlreadyExists(err) {
return err
Expand Down Expand Up @@ -386,3 +393,22 @@ func genCertAndKeyFile(certData, keyData []byte, certDir string) error {
klog.V(2).InfoS("successfully generate certificate and key files")
return nil
}

// bindWebhookConfigToFleetSystem sets the OwnerReference of the argued ValidatingWebhookConfiguration to the cluster scoped fleet-system namespace.
func bindWebhookConfigToFleetSystem(ctx context.Context, k8Client client.Client, validatingWebhookConfig *admv1.ValidatingWebhookConfiguration) error {
var fleetNs corev1.Namespace
if err := k8Client.Get(ctx, client.ObjectKey{Name: "fleet-system"}, &fleetNs); err != nil {
return err
}

ownerRef := metav1.OwnerReference{
APIVersion: fleetNs.GroupVersionKind().GroupVersion().String(),
Kind: fleetNs.Kind,
Name: fleetNs.GetName(),
UID: fleetNs.GetUID(),
BlockOwnerDeletion: pointer.Bool(false),
}

validatingWebhookConfig.OwnerReferences = []metav1.OwnerReference{ownerRef}
return nil
}