-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #159 from cschwede/fix-status-networkattachments
Fix status issue and ensure NetworkAttachments are created
- Loading branch information
Showing
1 changed file
with
61 additions
and
13 deletions.
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 |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ import ( | |
| "k8s.io/apimachinery/pkg/runtime" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" | ||
|
|
||
| helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper" | ||
| service "github.com/openstack-k8s-operators/lib-common/modules/common/service" | ||
|
|
@@ -85,7 +86,7 @@ type Netconfig struct { | |
| // | ||
| // For more details, check Reconcile and its Result here: | ||
| // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile | ||
| func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, _err error) { | ||
| _ = r.Log.WithValues("swiftstorage", req.NamespacedName) | ||
|
|
||
| instance := &swiftv1beta1.SwiftStorage{} | ||
|
|
@@ -102,6 +103,43 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request | |
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| helper, err := helper.NewHelper( | ||
| instance, | ||
| r.Client, | ||
| r.Kclient, | ||
| r.Scheme, | ||
| r.Log, | ||
| ) | ||
| if err != nil { | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| // Always patch the instance status when exiting this function so we can persist any changes. | ||
| defer func() { | ||
| // update the Ready condition based on the sub conditions | ||
| if instance.Status.Conditions.AllSubConditionIsTrue() { | ||
| instance.Status.Conditions.MarkTrue( | ||
| condition.ReadyCondition, condition.ReadyMessage) | ||
| } else { | ||
| // something is not ready so reset the Ready condition | ||
| instance.Status.Conditions.MarkUnknown( | ||
| condition.ReadyCondition, condition.InitReason, condition.ReadyInitMessage) | ||
| // and recalculate it based on the state of the rest of the conditions | ||
| instance.Status.Conditions.Set( | ||
| instance.Status.Conditions.Mirror(condition.ReadyCondition)) | ||
| } | ||
| err := helper.PatchInstance(ctx, instance) | ||
| if err != nil { | ||
| _err = err | ||
| return | ||
| } | ||
| }() | ||
|
|
||
| // If we're not deleting this and the service object doesn't have our finalizer, add it. | ||
| if instance.DeletionTimestamp.IsZero() && controllerutil.AddFinalizer(instance, helper.GetFinalizer()) { | ||
| return ctrl.Result{}, nil | ||
| } | ||
|
|
||
| if instance.Status.Conditions == nil { | ||
| instance.Status.Conditions = condition.Conditions{} | ||
| cl := condition.CreateList( | ||
|
|
@@ -122,20 +160,10 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request | |
| } | ||
|
|
||
| if !instance.DeletionTimestamp.IsZero() { | ||
| controllerutil.RemoveFinalizer(instance, helper.GetFinalizer()) | ||
| return ctrl.Result{}, nil | ||
| } | ||
|
|
||
| helper, err := helper.NewHelper( | ||
| instance, | ||
| r.Client, | ||
| r.Kclient, | ||
| r.Scheme, | ||
| r.Log, | ||
| ) | ||
| if err != nil { | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| serviceLabels := swiftstorage.Labels() | ||
| envVars := make(map[string]env.Setter) | ||
|
|
||
|
|
@@ -181,7 +209,6 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request | |
| err.Error())) | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| // Get the storage network subnet range to include it in the | ||
| // NetworkPolicy for the storage pods | ||
| config := Netconfig{} | ||
|
|
@@ -217,6 +244,27 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request | |
| return ctrlResult, nil | ||
| } | ||
|
|
||
| // verify if network attachment matches expectations | ||
| networkReady, networkAttachmentStatus, err := networkattachment.VerifyNetworkStatusFromAnnotation(ctx, helper, instance.Spec.NetworkAttachments, serviceLabels, instance.Status.ReadyCount) | ||
| if err != nil { | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| instance.Status.NetworkAttachments = networkAttachmentStatus | ||
| if networkReady { | ||
| instance.Status.Conditions.MarkTrue(condition.NetworkAttachmentsReadyCondition, condition.NetworkAttachmentsReadyMessage) | ||
| } else { | ||
| err := fmt.Errorf("not all pods have interfaces with ips as configured in NetworkAttachments: %s", instance.Spec.NetworkAttachments) | ||
| instance.Status.Conditions.Set(condition.FalseCondition( | ||
| condition.NetworkAttachmentsReadyCondition, | ||
| condition.ErrorReason, | ||
| condition.SeverityWarning, | ||
| condition.NetworkAttachmentsReadyErrorMessage, | ||
| err.Error())) | ||
|
|
||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| instance.Status.ReadyCount = sset.GetStatefulSet().Status.ReadyReplicas | ||
| if instance.Status.ReadyCount == *instance.Spec.Replicas { | ||
| // When the cluster is attached to an external network, create DNS record for every | ||
|
|
||