vexxhost/openstack-operator
Code Issues Proposed changes

make ReconcileService

Browse Source 
Change-Id: I76d3065d14bee56e1dce4830ff40f315c648ce4d
This commit is contained in:
okozachenko 2020-04-14 12:33:57 -07:00
parent 180fd40b64
commit bbbe4f9b68
2 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
controllers/mcrouter_controller.go
View File

@ -193,24 +193,11 @@ func (r *McrouterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
log.WithValues("resource", "mcrouter-alertrule").WithValues("op", op).Info("Reconciled")
// Service
service := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Namespace: req.Namespace,
Name: fmt.Sprintf("mcrouter-%s", req.Name),
},
if res, err := r.ReconcileService(ctx, req, &mcrouter, log, labels); err != nil || res != (ctrl.Result{}) {
return res, err
}
op, err = k8sutils.CreateOrUpdate(ctx, r, service, func() error {
return builders.Service(service, &mcrouter, r.Scheme).
Port("mcrouter", 11211).
Selector(labels).
Build()
})
if err != nil {
return ctrl.Result{}, err
}
log.WithValues("resource", "Service").WithValues("op", op).Info("Reconciled")
return ctrl.Result{}, nil
}
// SetupWithManager initializes the controller with primary manager
@ -224,3 +211,24 @@ func (r *McrouterReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&monitoringv1.PrometheusRule{}).
Complete(r)
}
// ReconcileService reconciles the service
func (r *McrouterReconciler) ReconcileService(ctx context.Context, req ctrl.Request, mcrouter *infrastructurev1alpha1.Mcrouter, log logr.Logger, labels map[string]string) (ctrl.Result, error) {
service := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Namespace: req.Namespace,
Name: fmt.Sprintf("mcrouter-%s", req.Name),
},
}
op, err := k8sutils.CreateOrUpdate(ctx, r, service, func() error {
return builders.Service(service, mcrouter, r.Scheme).
Port("mcrouter", 11211).
Selector(labels).
Build()
})
if err != nil {
return ctrl.Result{}, err
}
log.WithValues("resource", "Service").WithValues("op", op).Info("Reconciled")
return ctrl.Result{}, nil
}

39
controllers/rabbitmq_controller.go
View File

@ -178,23 +178,9 @@ func (r *RabbitmqReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
log.WithValues("resource", "rabbitmq-alertrule").WithValues("op", op).Info("Reconciled")
// Service
service := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Namespace: req.Namespace,
Name: fmt.Sprintf("rabbitmq-%s", req.Name),
},
if res, err := r.ReconcileService(ctx, req, &Rabbitmq, log, labels); err != nil || res != (ctrl.Result{}) {
return res, err
}
op, err = k8sutils.CreateOrUpdate(ctx, r, service, func() error {
return builders.Service(service, &Rabbitmq, r.Scheme).
Port("rabbitmq", 5672).
Selector(labels).
Build()
})
if err != nil {
return ctrl.Result{}, err
}
log.WithValues("resource", "Service").WithValues("op", op).Info("Reconciled")
return ctrl.Result{}, nil
}
@ -208,3 +194,24 @@ func (r *RabbitmqReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&monitoringv1.PrometheusRule{}).
Complete(r)
}
// ReconcileService reconciles the service
func (r *RabbitmqReconciler) ReconcileService(ctx context.Context, req ctrl.Request, rabbitmq *infrastructurev1alpha1.Rabbitmq, log logr.Logger, labels map[string]string) (ctrl.Result, error) {
service := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{
Namespace: req.Namespace,
Name: fmt.Sprintf("rabbitmq-%s", req.Name),
},
}
op, err := k8sutils.CreateOrUpdate(ctx, r, service, func() error {
return builders.Service(service, rabbitmq, r.Scheme).
Port("rabbitmq", 5672).
Selector(labels).
Build()
})
if err != nil {
return ctrl.Result{}, err
}
log.WithValues("resource", "Service").WithValues("op", op).Info("Reconciled")
return ctrl.Result{}, nil
}