Skip to content
This repository has been archived by the owner on Feb 9, 2022. It is now read-only.

Commit

Permalink
Add controller to reconcile node's providerID
Browse files Browse the repository at this point in the history
This controller is a replacement for a cloud provider. Its purpose is to
to set the node spec.providerID by querying ovirt/RHV api, where the
node name is the VM name.

This will make autoscalling work.

Signed-off-by: Roy Golan <[email protected]>
  • Loading branch information
rgolangh committed Jul 30, 2020
1 parent ac4db5b commit a865d06
Show file tree
Hide file tree
Showing 7 changed files with 352 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/openshift/cluster-api-provider-ovirt/pkg/apis"
"github.com/openshift/cluster-api-provider-ovirt/pkg/cloud/ovirt"
"github.com/openshift/cluster-api-provider-ovirt/pkg/cloud/ovirt/machine"
"github.com/openshift/cluster-api-provider-ovirt/pkg/cloud/ovirt/providerIDcontroller"

clusterapis "github.com/openshift/cluster-api/pkg/apis"
"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset"
Expand Down Expand Up @@ -146,6 +147,8 @@ func main() {

capimachine.AddWithActuator(mgr, machineActuator)

providerIDcontroller.Add(mgr, manager.Options{})

if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil {
klog.Fatal(err)
}
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/openshift/cluster-api-provider-ovirt
go 1.12

require (
github.com/go-logr/logr v0.1.0
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/openshift/cluster-api v0.0.0-20191030113141-9a3a7bbe9258
github.com/ovirt/go-ovirt v0.0.0-20200428093010-9bcc4fd4e6c0
Expand Down
145 changes: 145 additions & 0 deletions pkg/cloud/ovirt/providerIDcontroller/providerIDController.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
package providerIDcontroller

import (
"context"
"fmt"

"github.com/go-logr/logr"
ovirtsdk "github.com/ovirt/go-ovirt"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/klogr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/openshift/cluster-api-provider-ovirt/pkg/cloud/ovirt/clients"
)

var _ reconcile.Reconciler = &providerIDReconciler{}

type providerIDReconciler struct {
log logr.Logger
client client.Client
listNodesByFieldFunc func(key, value string) ([]corev1.Node, error)
fetchProviderIDFunc func(string) (string, error)
ovirtApi *ovirtsdk.Connection
}

func (r *providerIDReconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) {
r.log.V(3).Info("Reconciling", "node", request.NamespacedName)

// Fetch the Node instance
node := corev1.Node{}
err := r.client.Get(context.Background(), request.NamespacedName, &node)
if err != nil {
if errors.IsNotFound(err) {
// Request object not found, could have been deleted after reconcile request.
// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
// Return and don't requeue
return reconcile.Result{}, nil
}
// Error reading the object - requeue the request.
return reconcile.Result{}, fmt.Errorf("error getting node: %v", err)
}

if node.Spec.ProviderID != "" {
return reconcile.Result{}, nil
}

r.log.Info("spec.ProviderID is empty, fetching from ovirt", "node", request.NamespacedName)
id, err := r.fetchProviderIDFunc(node.Name)
if err != nil {
return reconcile.Result{}, fmt.Errorf("failed getting VM from oVirt: %v", err)
}

node.Spec.ProviderID = fmt.Sprintf("ovirt://%s", id)
err = r.client.Update(context.Background(), &node)
if err != nil {
return reconcile.Result{}, fmt.Errorf("failed updating node %s: %v", node.Name, err)
}
return reconcile.Result{}, nil
}

func (r *providerIDReconciler) fetchOvirtVmID(nodeName string) (string, error) {
c, err := r.getConnection("openshift-machine-api", "ovirt-credentials")
if err != nil {
return "", err
}
send, err := c.SystemService().VmsService().List().Search(fmt.Sprintf("name=%s", nodeName)).Send()
if err != nil {
r.log.Error(err, "Failed to find VM", "VM name", nodeName)
return "", err
}
vms := send.MustVms().Slice()
if len(vms) != 1 {
return "", fmt.Errorf("expected to get 1 VM but got %v", len(vms))
}
return vms[0].MustId(), nil
}

func Add(mgr manager.Manager, opts manager.Options) error {
reconciler, err := NewProviderIDReconciler(mgr)

if err != nil {
return fmt.Errorf("error building reconciler: %v", err)
}

c, err := controller.New("provdierID-controller", mgr, controller.Options{Reconciler: reconciler})
if err != nil {
return err
}

//Watch node changes
err = c.Watch(&source.Kind{Type: &corev1.Node{}}, &handler.EnqueueRequestForObject{})
if err != nil {
return err
}

return nil
}

func NewProviderIDReconciler(mgr manager.Manager) (*providerIDReconciler, error) {
log.SetLogger(klogr.New())
r := providerIDReconciler{
log: log.Log.WithName("controllers").WithName("providerID-reconciler"),
client: mgr.GetClient(),
}
r.fetchProviderIDFunc = r.fetchOvirtVmID
return &r, nil
}

func (r *providerIDReconciler) getConnection(namespace, secretName string) (*ovirtsdk.Connection, error) {
var err error
if r.ovirtApi == nil || r.ovirtApi.Test() != nil {
// session expired or some other error, re-login.
r.ovirtApi, err = createApiConnection(r.client, namespace, secretName)
}
return r.ovirtApi, err
}

//createApiConnection returns a a client to oVirt's API endpoint
func createApiConnection(client client.Client, namespace string, secretName string) (*ovirtsdk.Connection, error) {
creds, err := clients.GetCredentialsSecret(client, namespace, secretName)

if err != nil {
return nil, fmt.Errorf("failed getting credentials for namespace %s, %s", namespace, err)
}

connection, err := ovirtsdk.NewConnectionBuilder().
URL(creds.URL).
Username(creds.Username).
Password(creds.Password).
CAFile(creds.CAFile).
Insecure(creds.Insecure).
Build()
if err != nil {
return nil, err
}

return connection, nil
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package providerIDcontroller
8 changes: 8 additions & 0 deletions vendor/k8s.io/klog/klogr/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

193 changes: 193 additions & 0 deletions vendor/k8s.io/klog/klogr/klogr.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ k8s.io/client-go/util/retry
k8s.io/client-go/util/workqueue
# k8s.io/klog v1.0.0
k8s.io/klog
k8s.io/klog/klogr
# k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
k8s.io/kube-openapi/pkg/util/proto
# k8s.io/utils v0.0.0-20190923111123-69764acb6e8e
Expand Down

0 comments on commit a865d06

Please sign in to comment.