From bdfdac8ee4fd5c9abbde3e15eb83e911c68e0396 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 23 Sep 2019 20:51:47 +0530 Subject: [PATCH] Update service if already present previously we are not updating the service if it's already present. with this change, we will update the service. this does not trigger any error message if service already present. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/csi/spec.go | 5 ++--- pkg/operator/k8sutil/statefulset.go | 10 ---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 44f07f7ee..86946d391 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -226,7 +226,7 @@ func StartCSIDrivers(namespace string, clientset kubernetes.Interface, ver *vers } if rbdService != nil { - err = k8sutil.CreateService("rbdplugin-service", namespace, clientset, rbdService) + _, err = k8sutil.CreateOrUpdateService(clientset, namespace, rbdService) if err != nil { return fmt.Errorf("failed to create rbd service: %+v\n%+v", err, rbdService) } @@ -252,9 +252,8 @@ func StartCSIDrivers(namespace string, clientset kubernetes.Interface, ver *vers } } if cephfsService != nil { - err = k8sutil.CreateService("cephfsplugin-service", namespace, clientset, cephfsService) + _, err = k8sutil.CreateOrUpdateService(clientset, namespace, cephfsService) if err != nil { - return fmt.Errorf("failed to create rbd service: %+v\n%+v", err, cephfsService) } } diff --git a/pkg/operator/k8sutil/statefulset.go b/pkg/operator/k8sutil/statefulset.go index 606b72ca6..3b171f35f 100644 --- a/pkg/operator/k8sutil/statefulset.go +++ b/pkg/operator/k8sutil/statefulset.go @@ -20,20 +20,10 @@ import ( "fmt" apps "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" ) -// make a headless svc for statefulset -func CreateService(name, namespace string, clientset kubernetes.Interface, svc *corev1.Service) error { - _, err := clientset.CoreV1().Services(namespace).Create(svc) - if err != nil && !k8serrors.IsAlreadyExists(err) { - return fmt.Errorf("failed to create %s service. %+v", name, err) - } - return nil -} - // create a apps.statefulset func CreateStatefulSet(name, namespace string, clientset kubernetes.Interface, ss *apps.StatefulSet) error { _, err := clientset.AppsV1().StatefulSets(namespace).Create(ss)