From 432f21ac329a7ae340c57b9fcd8b9dfa03e73057 Mon Sep 17 00:00:00 2001
From: Alena Varkockova <avarkockova@mesosphere.com>
Date: Mon, 14 Oct 2019 17:51:35 +0200
Subject: [PATCH] Use built in isExists (#942)

---
 pkg/kudoctl/cmd/init/crds.go    | 15 +++------------
 pkg/kudoctl/cmd/init/manager.go |  5 +++--
 pkg/kudoctl/cmd/init/prereqs.go |  9 +++++----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkg/kudoctl/cmd/init/crds.go b/pkg/kudoctl/cmd/init/crds.go
index 9f10c85c0..1c076e32e 100644
--- a/pkg/kudoctl/cmd/init/crds.go
+++ b/pkg/kudoctl/cmd/init/crds.go
@@ -1,7 +1,6 @@
 package init
 
 import (
-	"errors"
 	"strings"
 
 	"github.com/kudobuilder/kudo/pkg/kudoctl/clog"
@@ -35,7 +34,7 @@ func installCrds(client apiextensionsclient.Interface) error {
 func installOperator(client v1beta1.CustomResourceDefinitionsGetter) error {
 	o := generateOperator()
 	_, err := client.CustomResourceDefinitions().Create(o)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("crd %v already exists", o.Name)
 		return nil
 	}
@@ -43,18 +42,10 @@ func installOperator(client v1beta1.CustomResourceDefinitionsGetter) error {
 
 }
 
-func isAlreadyExistsError(err error) bool {
-	var statusError *kerrors.StatusError
-	if errors.As(err, &statusError) {
-		return statusError.ErrStatus.Reason == "AlreadyExists"
-	}
-	return false
-}
-
 func installOperatorVersion(client v1beta1.CustomResourceDefinitionsGetter) error {
 	ov := generateOperatorVersion()
 	_, err := client.CustomResourceDefinitions().Create(ov)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("crd %v already exists", ov.Name)
 		return nil
 	}
@@ -64,7 +55,7 @@ func installOperatorVersion(client v1beta1.CustomResourceDefinitionsGetter) erro
 func installInstance(client v1beta1.CustomResourceDefinitionsGetter) error {
 	instance := generateInstance()
 	_, err := client.CustomResourceDefinitions().Create(instance)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("crd %v already exists", instance.Name)
 		return nil
 	}
diff --git a/pkg/kudoctl/cmd/init/manager.go b/pkg/kudoctl/cmd/init/manager.go
index ecc6a71f8..24c4c259b 100644
--- a/pkg/kudoctl/cmd/init/manager.go
+++ b/pkg/kudoctl/cmd/init/manager.go
@@ -9,6 +9,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -93,7 +94,7 @@ func installManager(client kubernetes.Interface, opts Options) error {
 func installStatefulSet(client appsv1client.StatefulSetsGetter, opts Options) error {
 	ss := generateDeployment(opts)
 	_, err := client.StatefulSets(opts.Namespace).Create(ss)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("statefulset %v already exists", ss.Name)
 		return nil
 	}
@@ -103,7 +104,7 @@ func installStatefulSet(client appsv1client.StatefulSetsGetter, opts Options) er
 func installService(client corev1.ServicesGetter, opts Options) error {
 	s := generateService(opts)
 	_, err := client.Services(opts.Namespace).Create(s)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("service %v already exists", s.Name)
 		return nil
 	}
diff --git a/pkg/kudoctl/cmd/init/prereqs.go b/pkg/kudoctl/cmd/init/prereqs.go
index 54351a435..60f881ae2 100644
--- a/pkg/kudoctl/cmd/init/prereqs.go
+++ b/pkg/kudoctl/cmd/init/prereqs.go
@@ -5,6 +5,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
@@ -35,7 +36,7 @@ func installPrereqs(client kubernetes.Interface, opts Options) error {
 func installSecret(client corev1.SecretsGetter, opts Options) error {
 	secret := generateWebHookSecret(opts)
 	_, err := client.Secrets(opts.Namespace).Create(secret)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("secret %v already exists", secret.Name)
 		return nil
 	}
@@ -45,7 +46,7 @@ func installSecret(client corev1.SecretsGetter, opts Options) error {
 func installRoleBindings(client kubernetes.Interface, opts Options) error {
 	rbac := generateRoleBinding(opts)
 	_, err := client.RbacV1().ClusterRoleBindings().Create(rbac)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("role binding %v already exists", rbac.Name)
 		return nil
 	}
@@ -55,7 +56,7 @@ func installRoleBindings(client kubernetes.Interface, opts Options) error {
 func installNamespace(client corev1.NamespacesGetter, opts Options) error {
 	ns := generateSysNamespace(opts.Namespace)
 	_, err := client.Namespaces().Create(ns)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("namespace %v already exists", ns.Name)
 		return nil
 	}
@@ -65,7 +66,7 @@ func installNamespace(client corev1.NamespacesGetter, opts Options) error {
 func installServiceAccount(client corev1.ServiceAccountsGetter, opts Options) error {
 	sa := generateServiceAccount(opts)
 	_, err := client.ServiceAccounts(opts.Namespace).Create(sa)
-	if isAlreadyExistsError(err) {
+	if kerrors.IsAlreadyExists(err) {
 		clog.V(4).Printf("service account %v already exists", sa.Name)
 		return nil
 	}