feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #9396 from y1r/add-context-k8sutil-service

Browse Source 
core: add context parameter to k8sutil service
This commit is contained in:
Sébastien Han
2021-12-13 10:03:37 +01:00
committed by GitHub
parent b10e3419b0 03e976b52c
commit 0ffb22faa3
9 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/cluster_external.go
+1 -1
View File
@@ -213,7 +213,7 @@ func (c *ClusterController) configureExternalClusterMonitoring(context *clusterd
return err
}
logger.Info("creating mgr external monitoring service")
_, err = k8sutil.CreateOrUpdateService(context.Clientset, cluster.Namespace, service)
_, err = k8sutil.CreateOrUpdateService(cluster.ClusterInfo.Context, context.Clientset, cluster.Namespace, service)
if err != nil && !kerrors.IsAlreadyExists(err) {
return errors.Wrap(err, "failed to create or update mgr service")
}
pkg/operator/ceph/cluster/mgr/dashboard.go
+1 -1
View File
@@ -62,7 +62,7 @@ func (c *Cluster) configureDashboardService(activeDaemon string) error {
}
if c.spec.Dashboard.Enabled {
// expose the dashboard service
if _, err := k8sutil.CreateOrUpdateService(c.context.Clientset, c.clusterInfo.Namespace, dashboardService); err != nil {
if _, err := k8sutil.CreateOrUpdateService(c.clusterInfo.Context, c.context.Clientset, c.clusterInfo.Namespace, dashboardService); err != nil {
return errors.Wrap(err, "failed to configure dashboard svc")
}
} else {
pkg/operator/ceph/cluster/mgr/mgr.go
+1 -1
View File
@@ -301,7 +301,7 @@ func (c *Cluster) reconcileServices(activeDaemon string) error {
if err != nil {
return err
}
if _, err := k8sutil.CreateOrUpdateService(c.context.Clientset, c.clusterInfo.Namespace, service); err != nil {
if _, err := k8sutil.CreateOrUpdateService(c.clusterInfo.Context, c.context.Clientset, c.clusterInfo.Namespace, service); err != nil {
return errors.Wrap(err, "failed to create mgr metrics service")
}
pkg/operator/ceph/cluster/mon/service.go
+1 -1
View File
@@ -67,7 +67,7 @@ func (c *Cluster) createService(mon *monConfig) (string, error) {
}
}
s, err := k8sutil.CreateOrUpdateService(c.context.Clientset, c.Namespace, svcDef)
s, err := k8sutil.CreateOrUpdateService(c.ClusterInfo.Context, c.context.Clientset, c.Namespace, svcDef)
if err != nil {
return "", errors.Wrapf(err, "failed to create service for mon %s", mon.DaemonName)
}
pkg/operator/ceph/cr_manager.go
+1 -1
View File
@@ -185,7 +185,7 @@ func (o *Operator) startCRDManager(context context.Context, mgrErrorCh chan erro
return
}
if isPresent {
err := createWebhookService(o.context)
err := createWebhookService(context, o.context)
if err != nil {
mgrErrorCh <- errors.Wrap(err, "failed to create admission webhook service")
return
pkg/operator/ceph/csi/spec.go
+3 -3
View File
@@ -458,7 +458,7 @@ func (r *ReconcileCSI) startDrivers(ver *version.Info, ownerInfo *k8sutil.OwnerI
if err != nil {
return errors.Wrapf(err, "failed to set owner reference to rbd service %q", rbdService)
}
_, err = k8sutil.CreateOrUpdateService(r.context.Clientset, r.opConfig.OperatorNamespace, rbdService)
_, err = k8sutil.CreateOrUpdateService(r.opManagerContext, r.context.Clientset, r.opConfig.OperatorNamespace, rbdService)
if err != nil {
return errors.Wrapf(err, "failed to create rbd service %q", rbdService.Name)
}
@@ -525,7 +525,7 @@ func (r *ReconcileCSI) startDrivers(ver *version.Info, ownerInfo *k8sutil.OwnerI
if err != nil {
return errors.Wrapf(err, "failed to set owner reference to cephfs service %q", cephfsService)
}
_, err = k8sutil.CreateOrUpdateService(r.context.Clientset, r.opConfig.OperatorNamespace, cephfsService)
_, err = k8sutil.CreateOrUpdateService(r.opManagerContext, r.context.Clientset, r.opConfig.OperatorNamespace, cephfsService)
if err != nil {
return errors.Wrapf(err, "failed to create cephfs service %q", cephfsService.Name)
}
@@ -587,7 +587,7 @@ func (r *ReconcileCSI) deleteCSIDriverResources(ver *version.Info, daemonset, de
succeeded = false
}
err = k8sutil.DeleteService(r.context.Clientset, r.opConfig.OperatorNamespace, service)
err = k8sutil.DeleteService(r.opManagerContext, r.context.Clientset, r.opConfig.OperatorNamespace, service)
if err != nil {
logger.Errorf("failed to delete the %q. %v", service, err)
succeeded = false
pkg/operator/ceph/object/spec.go
+1 -1
View File
@@ -512,7 +512,7 @@ func (c *clusterConfig) reconcileService(cephObjectStore *cephv1.CephObjectStore
return "", errors.Wrapf(err, "failed to set owner reference to ceph object store service %q", service.Name)
}
svc, err := k8sutil.CreateOrUpdateService(c.context.Clientset, cephObjectStore.Namespace, service)
svc, err := k8sutil.CreateOrUpdateService(c.clusterInfo.Context, c.context.Clientset, cephObjectStore.Namespace, service)
if err != nil {
return "", errors.Wrapf(err, "failed to create or update object store %q service", cephObjectStore.Name)
}
pkg/operator/ceph/webhook.go
+2 -2
View File
@@ -72,7 +72,7 @@ func isSecretPresent(ctx context.Context, context *clusterd.Context) (bool, erro
return true, nil
}
func createWebhookService(context *clusterd.Context) error {
func createWebhookService(ctx context.Context, context *clusterd.Context) error {
webhookService := corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: admissionControllerAppName,
@@ -93,7 +93,7 @@ func createWebhookService(context *clusterd.Context) error {
},
}
_, err := k8sutil.CreateOrUpdateService(context.Clientset, namespace, &webhookService)
_, err := k8sutil.CreateOrUpdateService(ctx, context.Clientset, namespace, &webhookService)
if err != nil {
return err
}
pkg/operator/k8sutil/service.go
+4 -7
View File
@@ -28,9 +28,8 @@ import (
// CreateOrUpdateService creates a service or updates the service declaratively if it already exists.
func CreateOrUpdateService(
clientset kubernetes.Interface, namespace string, serviceDefinition *v1.Service,
ctx context.Context, clientset kubernetes.Interface, namespace string, serviceDefinition *v1.Service,
) (*v1.Service, error) {
ctx := context.TODO()
name := serviceDefinition.Name
logger.Debugf("creating service %s", name)
@@ -39,7 +38,7 @@ func CreateOrUpdateService(
if !errors.IsAlreadyExists(err) {
return nil, fmt.Errorf("failed to create service %s. %+v", name, err)
}
s, err = UpdateService(clientset, namespace, serviceDefinition)
s, err = UpdateService(ctx, clientset, namespace, serviceDefinition)
if err != nil {
return nil, fmt.Errorf("failed to update service %s. %+v", name, err)
}
@@ -52,9 +51,8 @@ func CreateOrUpdateService(
// UpdateService updates a service declaratively. If the service does not exist this is considered
// an error condition.
func UpdateService(
clientset kubernetes.Interface, namespace string, serviceDefinition *v1.Service,
ctx context.Context, clientset kubernetes.Interface, namespace string, serviceDefinition *v1.Service,
) (*v1.Service, error) {
ctx := context.TODO()
name := serviceDefinition.Name
logger.Debugf("updating service %s", name)
existing, err := clientset.CoreV1().Services(namespace).Get(ctx, name, metav1.GetOptions{})
@@ -69,8 +67,7 @@ func UpdateService(
}
// DeleteService deletes a Service and returns the error if any
func DeleteService(clientset kubernetes.Interface, namespace, name string) error {
ctx := context.TODO()
func DeleteService(ctx context.Context, clientset kubernetes.Interface, namespace, name string) error {
err := clientset.CoreV1().Services(namespace).Delete(ctx, name, metav1.DeleteOptions{})
if err != nil {
if errors.IsNotFound(err) {