Removed old code, fixed webhook deletion

Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
kudobuilder · May 26, 2020 · 7e6f3c7 · 7e6f3c7
1 parent 85dd61d
commit 7e6f3c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/pkg/kudoctl/cmd/init_integration_test.go b/pkg/kudoctl/cmd/init_integration_test.go
@@ -377,16 +377,6 @@ func TestReInitFails(t *testing.T) {
 	assertStringContains(t, "CRD operators.kudo.dev is already installed. Did you mean to use --upgrade?", buf.String())
 }
 
-//func deleteInitObjects(client *testutils.RetryClient) {
-//	opts := kudoinit.NewOptions("", "", "", false, false)
-//	crds := crd.NewInitializer()
-//
-//	deleteCRDs(crds.Resources(), client)
-//	deletePrereq(prereq.NewNamespaceInitializer(opts).Resources(), client)
-//	deletePrereq(prereq.NewServiceAccountInitializer(opts).Resources(), client)
-//	deletePrereq(prereq.NewWebHookInitializer(opts).Resources(), client)
-//}
-
 func deleteObjects(objs []runtime.Object, client *testutils.RetryClient) error {
 	for _, obj := range objs {
 		if err := client.Delete(context.TODO(), obj); err != nil {

diff --git a/pkg/kudoctl/kudoinit/prereq/webhook.go b/pkg/kudoctl/kudoinit/prereq/webhook.go
@@ -128,6 +128,10 @@ func (k KudoWebHook) Install(client *kube.Client) error {
 func UninstallWebHook(client *kube.Client) error {
 	err := client.KubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Delete(instanceAdmissionWebHookName, &metav1.DeleteOptions{})
 	if err != nil {
+		if kerrors.IsNotFound(err) {
+			// We can ignore this, maybe we upgrade from an old version that did not have webhooks enabled
+			return nil
+		}
 		return fmt.Errorf("failed to uninstall WebHook: %v", err)
 	}
 	return nil