Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix machinepool cluster name issue #325

Merged
merged 10 commits into from
Aug 24, 2023
Merged

Fix machinepool cluster name issue #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
58c4648
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
e274d30
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
aa99272
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
8460bbd
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
e4969f3
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
32a1a9d
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
2de68e8
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
26bf57e
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
4156671
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
340fa9d
Fix machinepool infrastructure cluster lookup
shyamradhakrishnan Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 55 additions & 7 deletions controllers/ocimachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,25 +112,31 @@ func (r *OCIMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}

var clusterAccessor scope.OCIClusterAccessor
if err := r.Client.Get(ctx, ociClusterName, ociCluster); err != nil {
if cluster.Spec.InfrastructureRef.Kind == "OCICluster" {
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved
if err := r.Client.Get(ctx, ociClusterName, ociCluster); err != nil {
logger.Info("Cluster is not available yet")
r.Recorder.Eventf(ociMachine, corev1.EventTypeWarning, "ClusterNotAvailable", "Cluster is not available yet")
return ctrl.Result{}, nil
}
clusterAccessor = scope.OCISelfManagedCluster{
OCICluster: ociCluster,
}
} else if cluster.Spec.InfrastructureRef.Kind == "OCIManagedCluster" {
// check for oci managed cluster
ociManagedCluster := &infrastructurev1beta2.OCIManagedCluster{}
ociManagedClusterName := client.ObjectKey{
Namespace: cluster.Namespace,
Name: cluster.Spec.InfrastructureRef.Name,
}
if err := r.Client.Get(ctx, ociManagedClusterName, ociManagedCluster); err != nil {
logger.Info("Cluster is not available yet")
r.Recorder.Eventf(ociMachine, corev1.EventTypeWarning, "ClusterNotAvailable", "Cluster is not available yet")
return ctrl.Result{}, nil

}
clusterAccessor = scope.OCIManagedCluster{
OCIManagedCluster: ociManagedCluster,
}
} else {
clusterAccessor = scope.OCISelfManagedCluster{
OCICluster: ociCluster,
}
r.Recorder.Eventf(ociMachine, corev1.EventTypeWarning, "InfrastructureClusterTypeNotSupported", fmt.Sprintf("Infrastructure Cluster Type %s is not supported", cluster.Spec.InfrastructureRef.Kind))
return ctrl.Result{}, errors.New(fmt.Sprintf("Infrastructure Cluster Type %s is not supported", cluster.Spec.InfrastructureRef.Kind))
}

_, _, clients, err := cloudutil.InitClientsAndRegion(ctx, r.Client, r.Region, clusterAccessor, r.ClientProvider)
Expand Down Expand Up @@ -189,6 +195,10 @@ func (r *OCIMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Ma
&infrastructurev1beta2.OCICluster{},
handler.EnqueueRequestsFromMapFunc(r.OCIClusterToOCIMachines()),
).
Watches(
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved
&infrastructurev1beta2.OCIManagedCluster{},
handler.EnqueueRequestsFromMapFunc(r.OCIManagedClusterToOCIMachines()),
).
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToObjectFunc),
Expand Down Expand Up @@ -242,6 +252,44 @@ func (r *OCIMachineReconciler) OCIClusterToOCIMachines() handler.MapFunc {
}
}

func (r *OCIMachineReconciler) OCIManagedClusterToOCIMachines() handler.MapFunc {
return func(ctx context.Context, o client.Object) []ctrl.Request {
log := ctrl.LoggerFrom(ctx)
result := []ctrl.Request{}

c, ok := o.(*infrastructurev1beta2.OCIManagedCluster)
if !ok {
log.Error(errors.Errorf("expected a OCICluster but got a %T", o), "failed to get OCIMachine for OCICluster")
return nil
}

cluster, err := util.GetOwnerCluster(ctx, r.Client, c.ObjectMeta)
switch {
case apierrors.IsNotFound(err) || cluster == nil:
return result
case err != nil:
log.Error(err, "failed to get owning cluster")
return result
}

labels := map[string]string{clusterv1.ClusterNameLabel: cluster.Name}
machineList := &clusterv1.MachineList{}
if err := r.List(ctx, machineList, client.InNamespace(c.Namespace), client.MatchingLabels(labels)); err != nil {
log.Error(err, "failed to list Machines")
return nil
}
for _, m := range machineList.Items {
if m.Spec.InfrastructureRef.Name == "" {
continue
}
name := client.ObjectKey{Namespace: m.Namespace, Name: m.Spec.InfrastructureRef.Name}
result = append(result, ctrl.Request{NamespacedName: name})
}

return result
}
}

func (r *OCIMachineReconciler) reconcileNormal(ctx context.Context, logger logr.Logger, machineScope *scope.MachineScope) (ctrl.Result, error) {
controllerutil.AddFinalizer(machineScope.OCIMachine, infrastructurev1beta2.MachineFinalizer)
machine := machineScope.OCIMachine
Expand Down
1 change: 1 addition & 0 deletions controllers/ocimachine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,7 @@ func getOciMachineWithNoOwner() *infrastructurev1beta2.OCIMachine {
func getCluster() *clusterv1.Cluster {
infraRef := corev1.ObjectReference{
Name: "oci-cluster",
Kind: "OCICluster",
}
return &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Expand Down
44 changes: 31 additions & 13 deletions exp/controllers/ocimachinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/handler"
Expand Down Expand Up @@ -113,15 +114,23 @@ func (r *OCIMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
logger.Info("OCIMachinePool or linked Cluster is marked as paused. Won't reconcile")
return ctrl.Result{}, nil
}

ociCluster := &infrastructurev1beta2.OCICluster{}
ociClusterName := client.ObjectKey{
Namespace: cluster.Namespace,
Name: cluster.Name,
}

var clusterAccessor scope.OCIClusterAccessor
if err := r.Client.Get(ctx, ociClusterName, ociCluster); err != nil {
if cluster.Spec.InfrastructureRef.Kind == "OCICluster" {
ociCluster := &infrastructurev1beta2.OCICluster{}
ociClusterName := client.ObjectKey{
Namespace: cluster.Namespace,
Name: cluster.Spec.InfrastructureRef.Name,
}
if err := r.Client.Get(ctx, ociClusterName, ociCluster); err != nil {
logger.Info("Cluster is not available yet")
r.Recorder.Eventf(ociMachinePool, corev1.EventTypeWarning, "ClusterNotAvailable", "Cluster is not available yet")
logger.V(2).Info("OCICluster is not available yet")
return ctrl.Result{}, nil
}
clusterAccessor = scope.OCISelfManagedCluster{
OCICluster: ociCluster,
}
} else if cluster.Spec.InfrastructureRef.Kind == "OCIManagedCluster" {
ociManagedCluster := &infrastructurev1beta2.OCIManagedCluster{}
ociManagedClusterName := client.ObjectKey{
Namespace: cluster.Namespace,
Expand All @@ -130,16 +139,15 @@ func (r *OCIMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
if err := r.Client.Get(ctx, ociManagedClusterName, ociManagedCluster); err != nil {
logger.Info("Cluster is not available yet")
r.Recorder.Eventf(ociMachinePool, corev1.EventTypeWarning, "ClusterNotAvailable", "Cluster is not available yet")
logger.V(2).Info("OCICluster is not available yet")
logger.V(2).Info("OCIManagedCluster is not available yet")
return ctrl.Result{}, nil
}
clusterAccessor = scope.OCIManagedCluster{
OCIManagedCluster: ociManagedCluster,
}
} else {
clusterAccessor = scope.OCISelfManagedCluster{
OCICluster: ociCluster,
}
r.Recorder.Eventf(ociMachinePool, corev1.EventTypeWarning, "InfrastructureClusterTypeNotSupported", fmt.Sprintf("Infrastructure Cluster Type %s is not supported", cluster.Spec.InfrastructureRef.Kind))
return ctrl.Result{}, errors.New(fmt.Sprintf("Infrastructure Cluster Type %s is not supported", cluster.Spec.InfrastructureRef.Kind))
}

_, _, clients, err := cloudutil.InitClientsAndRegion(ctx, r.Client, r.Region, clusterAccessor, r.ClientProvider)
Expand Down Expand Up @@ -184,22 +192,32 @@ func (r *OCIMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctr
if err != nil {
return errors.Wrapf(err, "failed to create mapper for Cluster to OCIMachinePool")
}
gvk, err := apiutil.GVKForObject(new(infrav2exp.OCIMachinePool), mgr.GetScheme())
if err != nil {
return errors.Wrapf(err, "failed to find GVK for OCIMachinePool")
}
managedClusterToMachinePoolMap := managedClusterToManagedMachinePoolMapFunc(r.Client, gvk, logger)

err = ctrl.NewControllerManagedBy(mgr).
WithOptions(options).
For(&infrav2exp.OCIMachinePool{}).
WithEventFilter(predicates.ResourceNotPaused(ctrl.LoggerFrom(ctx))).
Watches(
&expclusterv1.MachinePool{},
handler.EnqueueRequestsFromMapFunc(machinePoolToInfrastructureMapFunc(infrav2exp.
GroupVersion.WithKind(scope.OCIMachinePoolKind), logger)),
).
Watches(
&infrastructurev1beta2.OCIManagedCluster{},
handler.EnqueueRequestsFromMapFunc(managedClusterToMachinePoolMap),
).
Watches(
&clusterv1.Cluster{},
handler.EnqueueRequestsFromMapFunc(clusterToObjectFunc),
builder.WithPredicates(
predicates.ClusterUnpausedAndInfrastructureReady(ctrl.LoggerFrom(ctx)),
),
).
WithEventFilter(predicates.ResourceNotPaused(ctrl.LoggerFrom(ctx))).
Complete(r)

if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions exp/controllers/ocimanaged_machinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (r *OCIManagedMachinePoolReconciler) Reconcile(ctx context.Context, req ctr
ociManagedCluster := &infrastructurev1beta2.OCIManagedCluster{}
ociClusterName := client.ObjectKey{
Namespace: cluster.Namespace,
Name: cluster.Name,
Name: cluster.Spec.InfrastructureRef.Name,
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved
}

if err := r.Client.Get(ctx, ociClusterName, ociManagedCluster); err != nil {
Expand Down Expand Up @@ -216,7 +216,7 @@ func managedClusterToManagedMachinePoolMapFunc(c client.Client, gvk schema.Group
return func(ctx context.Context, o client.Object) []reconcile.Request {
ociCluster, ok := o.(*infrastructurev1beta2.OCIManagedCluster)
if !ok {
panic(fmt.Sprintf("Expected a OCIManagedControlPlane but got a %T", o))
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved
panic(fmt.Sprintf("Expected a OCIManagedCluster but got a %T", o))
}

if !ociCluster.ObjectMeta.DeletionTimestamp.IsZero() {
Expand All @@ -225,7 +225,7 @@ func managedClusterToManagedMachinePoolMapFunc(c client.Client, gvk schema.Group

cluster, err := util.GetOwnerCluster(ctx, c, ociCluster.ObjectMeta)
if err != nil {
log.Error(err, "couldn't get OCI control plane owner ObjectKey")
log.Error(err, "couldn't get OCIManagedCluster owner ObjectKey")
return nil
}
if cluster == nil {
Expand Down
1 change: 1 addition & 0 deletions exp/controllers/ocimanaged_machinepool_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,7 @@ func getMachinePool() *expclusterv1.MachinePool {
func getCluster() *clusterv1.Cluster {
infraRef := corev1.ObjectReference{
Name: "oci-cluster",
Kind: "OCICluster",
}
return &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Expand Down
2 changes: 1 addition & 1 deletion exp/controllers/ocivirtual_machinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (r *OCIVirtualMachinePoolReconciler) Reconcile(ctx context.Context, req ctr
ociManagedCluster := &infrastructurev1beta2.OCIManagedCluster{}
ociClusterName := client.ObjectKey{
Namespace: cluster.Namespace,
Name: cluster.Name,
Name: cluster.Spec.InfrastructureRef.Name,
}

if err := r.Client.Get(ctx, ociClusterName, ociManagedCluster); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/data/infrastructure-oci/v1beta2/cluster-template-managed-virtual/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: OCIManagedCluster
name: "${CLUSTER_NAME}"
name: "${CLUSTER_NAME}-virtual"
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved
namespace: "${NAMESPACE}"
controlPlaneRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
Expand All @@ -22,7 +22,7 @@ kind: OCIManagedCluster
metadata:
labels:
cluster.x-k8s.io/cluster-name: "${CLUSTER_NAME}"
name: "${CLUSTER_NAME}"
name: "${CLUSTER_NAME}-virtual"
spec:
compartmentId: "${OCI_COMPARTMENT_ID}"
identityRef:
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/data/infrastructure-oci/v1beta2/cluster-template-managed/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: OCIManagedCluster
name: "${CLUSTER_NAME}"
name: "${CLUSTER_NAME}-managed"
namespace: "${NAMESPACE}"
controlPlaneRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
Expand All @@ -22,7 +22,7 @@ kind: OCIManagedCluster
metadata:
labels:
cluster.x-k8s.io/cluster-name: "${CLUSTER_NAME}"
name: "${CLUSTER_NAME}"
name: "${CLUSTER_NAME}-managed"
spec:
compartmentId: "${OCI_COMPARTMENT_ID}"
---
Expand Down