Basic E2E test for machine controller #80
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,7 +76,7 @@ jobs: | |
| - name: Docker cache | ||
| uses: ScribeMD/[email protected] | ||
| with: | ||
| key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}} | ||
|
|
||
| - name: Lint | ||
| run: make lint | ||
|
|
@@ -100,6 +100,7 @@ jobs: | |
| disable-sudo: true | ||
| egress-policy: block | ||
| allowed-endpoints: > | ||
| api.linode.com:443 | ||
| api.github.com:443 | ||
| github.com:443 | ||
| gcr.io:443 | ||
|
|
@@ -130,7 +131,7 @@ jobs: | |
| - name: Docker cache | ||
| uses: ScribeMD/[email protected] | ||
| with: | ||
| key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }}} | ||
|
|
||
| - name: E2E test | ||
| run: make e2etest | ||
|
|
@@ -173,7 +174,7 @@ jobs: | |
| - name: Docker cache | ||
| uses: ScribeMD/[email protected] | ||
| with: | ||
| key: docker-${{ runner.os }}-${{ hashFiles('go.sum') }} | ||
|
|
||
| - name: Build the Docker image | ||
| run: make docker-build | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,6 @@ package controller | |
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net/http" | ||
|
|
@@ -31,6 +30,7 @@ import ( | |
| "github.com/linode/linodego" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| utilerrors "k8s.io/apimachinery/pkg/util/errors" | ||
| "k8s.io/client-go/tools/record" | ||
| clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" | ||
| cerrs "sigs.k8s.io/cluster-api/errors" | ||
|
|
@@ -90,6 +90,8 @@ type LinodeMachineReconciler struct { | |
| // | ||
| // For more details, check Reconcile and its Result here: | ||
| // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile | ||
| // | ||
| //nolint:gocyclo,cyclop // As simple as possible. | ||
| func (r *LinodeMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultedLoopTimeout(r.ReconcileTimeout)) | ||
| defer cancel() | ||
|
|
@@ -98,17 +100,21 @@ func (r *LinodeMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques | |
|
|
||
| linodeMachine := &infrav1alpha1.LinodeMachine{} | ||
| if err := r.Client.Get(ctx, req.NamespacedName, linodeMachine); err != nil { | ||
| if err = client.IgnoreNotFound(err); err != nil { | ||
| log.Error(err, "Failed to fetch Linode machine") | ||
| } | ||
|
|
||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| machine, err := kutil.GetOwnerMachine(ctx, r.Client, linodeMachine.ObjectMeta) | ||
| switch { | ||
| case err != nil: | ||
| if err = client.IgnoreNotFound(err); err != nil { | ||
| log.Error(err, "Failed to fetch owner machine") | ||
| } | ||
|
|
||
| return ctrl.Result{}, err | ||
| case machine == nil: | ||
| log.Info("Machine Controller has not yet set OwnerRef, skipping reconciliation") | ||
|
|
||
|
|
@@ -134,14 +140,25 @@ func (r *LinodeMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques | |
| log = log.WithValues("Linode machine: ", machine.Name) | ||
|
|
||
| cluster, err := kutil.GetClusterFromMetadata(ctx, r.Client, machine.ObjectMeta) | ||
| switch { | ||
| case err != nil: | ||
| if err = client.IgnoreNotFound(err); err != nil { | ||
| log.Error(err, "Failed to fetch cluster by label") | ||
| } | ||
|
|
||
| return ctrl.Result{}, err | ||
| case cluster == nil: | ||
| err = errors.New("missing cluster") | ||
|
|
||
| log.Error(err, "Missing cluster") | ||
|
|
||
| return ctrl.Result{}, err | ||
| case cluster.Spec.InfrastructureRef == nil: | ||
| err = errors.New("missing infrastructure reference") | ||
|
|
||
| log.Error(err, "Missing infrastructure reference") | ||
|
|
||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| linodeCluster := &infrav1alpha1.LinodeCluster{} | ||
|
|
@@ -151,9 +168,11 @@ func (r *LinodeMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques | |
| } | ||
|
|
||
| if err = r.Client.Get(ctx, linodeClusterKey, linodeCluster); err != nil { | ||
| if err = client.IgnoreNotFound(err); err != nil { | ||
| log.Error(err, "Failed to fetch Linode cluster") | ||
| } | ||
|
|
||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| machineScope, err := scope.NewMachineScope( | ||
|
|
@@ -214,7 +233,7 @@ func (r *LinodeMachineReconciler) reconcile( | |
| } | ||
|
|
||
| // Always close the scope when exiting this function so we can persist any LinodeMachine changes. | ||
| if patchErr := machineScope.Close(ctx); patchErr != nil && utilerrors.FilterOut(patchErr) != nil { | ||
| logger.Error(patchErr, "failed to patch LinodeMachine") | ||
|
|
||
| err = errors.Join(err, patchErr) | ||
|
|
@@ -252,7 +271,7 @@ func (r *LinodeMachineReconciler) reconcile( | |
|
|
||
| logger = logger.WithValues("ID", *machineScope.LinodeMachine.Spec.InstanceID) | ||
|
|
||
| res, linodeInstance, err = r.reconcileUpdate(ctx, logger, machineScope) | ||
|
|
||
| return | ||
| } | ||
|
|
@@ -265,7 +284,7 @@ func (r *LinodeMachineReconciler) reconcile( | |
|
|
||
| return ctrl.Result{RequeueAfter: reconciler.DefaultMachineControllerWaitForBootstrapDelay}, nil | ||
| } | ||
| linodeInstance, err = r.reconcileCreate(ctx, logger, machineScope, clusterScope) | ||
|
|
||
| return | ||
| } | ||
|
|
@@ -275,7 +294,7 @@ func (r *LinodeMachineReconciler) reconcileCreate( | |
| logger logr.Logger, | ||
| machineScope *scope.MachineScope, | ||
| clusterScope *scope.ClusterScope, | ||
| ) (*linodego.Instance, error) { | ||
| logger.Info("creating machine") | ||
|
|
||
| tags := []string{string(machineScope.LinodeCluster.UID), string(machineScope.LinodeMachine.UID)} | ||
|
|
@@ -284,7 +303,7 @@ func (r *LinodeMachineReconciler) reconcileCreate( | |
| if err != nil { | ||
| logger.Error(err, "Failed to list Linode machine instances") | ||
|
|
||
| return nil, err | ||
| } | ||
|
|
||
| var linodeInstance *linodego.Instance | ||
|
|
@@ -294,36 +313,20 @@ func (r *LinodeMachineReconciler) reconcileCreate( | |
|
|
||
| linodeInstance = &linodeInstances[0] | ||
| case 0: | ||
|
There was a problem hiding this comment. @AshleyDumaine |
||
| // get the bootstrap data for the Linode instance and set it for create config | ||
| createConfig, err := r.newCreateConfig(ctx, machineScope, tags, logger) | ||
| if err != nil { | ||
| logger.Error(err, "Failed to create Linode machine create config") | ||
|
|
||
| return nil, err | ||
| } | ||
|
|
||
| if machineScope.LinodeCluster.Spec.VPCRef != nil { | ||
| iface, err := r.getVPCInterfaceConfig(ctx, machineScope, createConfig.Interfaces, logger) | ||
| if err != nil { | ||
| logger.Error(err, "Failed to get VPC interface confiog") | ||
|
|
||
| return nil, err | ||
| } | ||
|
|
||
| createConfig.Interfaces = append(createConfig.Interfaces, *iface) | ||
|
|
@@ -333,22 +336,22 @@ func (r *LinodeMachineReconciler) reconcileCreate( | |
| if err != nil { | ||
| logger.Error(err, "Failed to create Linode machine instance") | ||
|
|
||
| return nil, err | ||
| } | ||
| default: | ||
| err = errors.New("multiple instances") | ||
|
|
||
| logger.Error(err, "Panic! Multiple instances found. This might be a concurrency issue in the controller!!!", "tags", tags) | ||
|
|
||
| return nil, err | ||
| } | ||
|
|
||
| if linodeInstance == nil { | ||
| err = errors.New("missing instance") | ||
|
|
||
| logger.Error(err, "Panic! Failed to create isntance") | ||
|
|
||
| return nil, err | ||
| } | ||
|
|
||
| machineScope.LinodeMachine.Status.Ready = true | ||
|
|
@@ -366,26 +369,25 @@ func (r *LinodeMachineReconciler) reconcileCreate( | |
| if err = services.AddNodeToNB(ctx, logger, machineScope, clusterScope); err != nil { | ||
| logger.Error(err, "Failed to add instance to Node Balancer backend") | ||
|
|
||
| return linodeInstance, err | ||
| } | ||
|
|
||
| return linodeInstance, nil | ||
| } | ||
|
|
||
| func (r *LinodeMachineReconciler) reconcileUpdate( | ||
| ctx context.Context, | ||
| logger logr.Logger, | ||
| machineScope *scope.MachineScope, | ||
| ) (res reconcile.Result, linodeInstance *linodego.Instance, err error) { | ||
| logger.Info("updating machine") | ||
|
|
||
| res = ctrl.Result{} | ||
|
|
||
| if machineScope.LinodeMachine.Spec.InstanceID == nil { | ||
| return res, nil, errors.New("missing instance ID") | ||
| } | ||
|
|
||
| if linodeInstance, err = machineScope.LinodeClient.GetInstance(ctx, *machineScope.LinodeMachine.Spec.InstanceID); err != nil { | ||
| err = util.IgnoreLinodeAPIError(err, http.StatusNotFound) | ||
| if err != nil { | ||
|
|
@@ -400,27 +402,27 @@ func (r *LinodeMachineReconciler) reconcileUpdate( | |
| conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, "missing", clusterv1.ConditionSeverityWarning, "instance not found") | ||
| } | ||
|
|
||
| return res, nil, err | ||
| } | ||
|
|
||
| if _, ok := requeueInstanceStatuses[linodeInstance.Status]; ok { | ||
| if linodeInstance.Updated.Add(reconciler.DefaultMachineControllerWaitForRunningTimeout).After(time.Now()) { | ||
| logger.Info("Instance has one operaton running, re-queuing reconciliation", "status", linodeInstance.Status) | ||
|
|
||
| return ctrl.Result{RequeueAfter: reconciler.DefaultMachineControllerWaitForRunningDelay}, linodeInstance, nil | ||
| } | ||
|
|
||
| logger.Info("Instance has one operaton long running, skipping reconciliation", "status", linodeInstance.Status) | ||
|
|
||
| conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string(linodeInstance.Status), clusterv1.ConditionSeverityInfo, "skipped due to long running operation") | ||
|
|
||
| return res, linodeInstance, nil | ||
| } else if linodeInstance.Status != linodego.InstanceRunning { | ||
| logger.Info("Instance has incompatible status, skipping reconciliation", "status", linodeInstance.Status) | ||
|
|
||
| conditions.MarkFalse(machineScope.LinodeMachine, clusterv1.ReadyCondition, string(linodeInstance.Status), clusterv1.ConditionSeverityInfo, "incompatible status") | ||
|
|
||
| return res, linodeInstance, nil | ||
| } | ||
|
|
||
| machineScope.LinodeMachine.Status.Ready = true | ||
|
|
@@ -429,7 +431,7 @@ func (r *LinodeMachineReconciler) reconcileUpdate( | |
|
|
||
| r.Recorder.Event(machineScope.LinodeMachine, corev1.EventTypeNormal, string(clusterv1.ReadyCondition), "instance is running") | ||
|
|
||
| return res, linodeInstance, nil | ||
| } | ||
|
|
||
| func (r *LinodeMachineReconciler) reconcileDelete( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AshleyDumaine there is a defer function which updates the status based on the linode instance status, so in this case we need the instance itself. This changes fixes: c2b2378#diff-8daab1045cecf480419b0a31c2f8558e51197d31a7be910386ef4e420db0f7a4