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

[release-4.14] OCPBUGS-17852: fix: allow multi-node readiness with master nodes with NoSchedule Taints #388

Merged
merged 1 commit into from
Aug 21, 2023
Merged

[release-4.14] OCPBUGS-17852: fix: allow multi-node readiness with master nodes with NoSchedule Taints #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 31 additions & 13 deletions controllers/lvmcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,20 @@ import (
"os"
"time"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/go-logr/logr"
secv1client "github.com/openshift/client-go/security/clientset/versioned/typed/security/v1"

lvmv1alpha1 "github.com/openshift/lvm-operator/api/v1alpha1"

topolvmv1 "github.com/topolvm/topolvm/api/v1"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
corev1helper "k8s.io/component-helpers/scheduling/corev1"

ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand Down Expand Up @@ -224,7 +227,7 @@ func (r *LVMClusterReconciler) updateLVMClusterStatus(ctx context.Context, insta
return err
}

expectedVgCount, err := r.getExpectedVgCount(ctx, instance)
expectedVGCount, err := r.getExpectedVGCount(ctx, instance)
if err != nil {
r.Log.Error(err, "failed to calculate expected VG count")
return err
Expand Down Expand Up @@ -258,11 +261,13 @@ func (r *LVMClusterReconciler) updateLVMClusterStatus(ctx context.Context, insta
instance.Status.State = lvmv1alpha1.LVMStatusProgressing
instance.Status.Ready = false

r.Log.Info("Verifying readiness", "expectedVGCount", expectedVGCount, "readyVGCount", readyVGCount)

if isFailed {
instance.Status.State = lvmv1alpha1.LVMStatusFailed
} else if isDegraded {
instance.Status.State = lvmv1alpha1.LVMStatusDegraded
} else if isReady && expectedVgCount == readyVGCount {
} else if isReady && expectedVGCount == readyVGCount {
instance.Status.State = lvmv1alpha1.LVMStatusReady
instance.Status.Ready = true
}
Expand Down Expand Up @@ -292,7 +297,7 @@ func (r *LVMClusterReconciler) updateLVMClusterStatus(ctx context.Context, insta
return nil
}

func (r *LVMClusterReconciler) getExpectedVgCount(ctx context.Context, instance *lvmv1alpha1.LVMCluster) (int, error) {
func (r *LVMClusterReconciler) getExpectedVGCount(ctx context.Context, instance *lvmv1alpha1.LVMCluster) (int, error) {

var vgCount int

Expand All @@ -304,12 +309,25 @@ func (r *LVMClusterReconciler) getExpectedVgCount(ctx context.Context, instance
}

for _, deviceClass := range instance.Spec.Storage.DeviceClasses {
if deviceClass.NodeSelector == nil {
vgCount += len(nodeList.Items)
continue
}

for i := range nodeList.Items {
ignoreDueToNoSchedule := false
for _, taint := range nodeList.Items[i].Spec.Taints {
if taint.Effect == corev1.TaintEffectNoSchedule {
r.Log.V(1).Info("even though node selector matches, NoSchedule forces ignore of the Node",
"node", nodeList.Items[i].GetName())
ignoreDueToNoSchedule = true
break
}
}
if ignoreDueToNoSchedule {
continue
}

if deviceClass.NodeSelector == nil {
vgCount++
continue
}

matches, err := corev1helper.MatchNodeSelectorTerms(&nodeList.Items[i], deviceClass.NodeSelector)
if err != nil {
r.Log.Error(err, "failed to match node selector")
Expand Down
14 changes: 9 additions & 5 deletions controllers/lvmcluster_controller_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,26 @@ var _ = Describe("LVMCluster controller", func() {
lvmVolumeGroupOut := &lvmv1alpha1.LVMVolumeGroup{}

// Topolvm Storage Classes
scNames := []types.NamespacedName{}
var scNames []types.NamespacedName
for _, deviceClass := range lvmClusterIn.Spec.Storage.DeviceClasses {
scNames = append(scNames, types.NamespacedName{
Name: getStorageClassName(deviceClass.Name),
},
)
})
}
scOut := &storagev1.StorageClass{}

Context("Reconciliation on creating an LVMCluster CR", func() {
It("should reconcile LVMCluster CR creation, ", func() {
By("verifying CR status on reconciliation")
Expect(k8sClient.Create(ctx, lvmClusterIn)).Should(Succeed())

// create node as it should be present
Expect(k8sClient.Create(ctx, nodeIn)).Should(Succeed())
// This update is necessary as all nodes get NoSchedule Taint on Creation,
// and we cannot create it explicitly without taints
nodeIn.Spec.Taints = make([]corev1.Taint, 0)
Expect(k8sClient.Update(ctx, nodeIn)).Should(Succeed())

Expect(k8sClient.Create(ctx, lvmClusterIn)).Should(Succeed())

// create lvmVolumeGroupNodeStatus as it should be created by vgmanager and
// lvmcluster controller expecting this to be present to set the status properly
Expect(k8sClient.Create(ctx, lvmVolumeGroupNodeStatusIn)).Should(Succeed())
Expand Down