Skip to content
This repository has been archived by the owner on Aug 17, 2023. It is now read-only.

Delete knative webhooks during KF uninstalling #436

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
20 changes: 20 additions & 0 deletions pkg/controller/kfdef/kfdef_controller.go
Original file line number Diff line number Diff line change
@@ -287,6 +287,26 @@ func (r *ReconcileKfDef) Reconcile(request reconcile.Request) (reconcile.Result,
// Remove this KfDef instance
delete(kfdefInstances, strings.Join([]string{instance.GetName(), instance.GetNamespace()}, "."))

// Knative webhooks need to be deleted manually
knativeWebhooks := map[string][]string{
"MutatingWebhookConfiguration": {
"webhook.serving.knative.dev",
},
"ValidatingWebhookConfiguration": {
"config.webhook.serving.knative.dev",
"validation.webhook.serving.knative.dev",
},
}
knativeWebhookApiVersion := "admissionregistration.k8s.io/v1beta1"
for webhookKind, webhooks := range knativeWebhooks {
for _, webhookName := range webhooks {
err = kfutils.DeleteResourceByNameAndKind(r.client, webhookName, webhookKind, knativeWebhookApiVersion)
}
}
if err != nil {
log.Errorf("Error removing knative webhooks: %v.", err)
}

// Remove finalizer once kfDelete is completed.
finalizers.Delete(finalizer)
instance.SetFinalizers(finalizers.List())
16 changes: 16 additions & 0 deletions pkg/utils/k8utils.go
Original file line number Diff line number Diff line change
@@ -594,6 +594,22 @@ func DeleteResource(resourceBytes []byte, kubeclient client.Client, timeout time
return nil
}

func DeleteResourceByNameAndKind(kubeclient client.Client, name string, kind string, apiVersion string) error {
u := &unstructured.Unstructured{}
u.SetName(name)
u.SetKind(kind)
u.SetAPIVersion(apiVersion)

log.Infof("Deleting resource %s with kind '%s' in APIVersion '%s'", name, kind, apiVersion)
err := kubeclient.Delete(context.TODO(), u)
if err != nil {
return errors.Wrapf(err, "Failed to delete resource %s with kind '%s' in APIVersion '%s'",
name, kind, apiVersion)
}

return nil
}

func SplitYAML(resources []byte) ([][]byte, error) {

dec := goyaml.NewDecoder(bytes.NewReader(resources))