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.

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

PWX-36477 : Updating Node PDB to allow k8s upgrades #1580

Merged
merged 10 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
129 changes: 129 additions & 0 deletions drivers/storage/portworx/component/disruption_budget.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"math"
"strconv"
"strings"

"github.com/hashicorp/go-version"
"github.com/libopenstorage/openstorage/api"
Expand Down Expand Up @@ -111,13 +112,22 @@ func (c *disruptionBudget) Reconcile(cluster *corev1.StorageCluster) error {
if err := c.createPortworxNodePodDisruptionBudget(cluster, ownerRef, nodeEnumerateResponse, k8sNodeList); err != nil {
return err
}
if err := c.deleteClusterPodDisruptionBudget(cluster, ownerRef); err != nil {
logrus.Warnf("failed to delete cluster poddisruptionbudget if exists: %v", err)
}
if err := c.deletePortworxNodePodDisruptionBudget(cluster, ownerRef, nodeEnumerateResponse, k8sNodeList); err != nil {
return err
}
if err := c.UpdateMinAvailableForNodePDB(cluster, ownerRef, nodeEnumerateResponse, k8sNodeList); err != nil {
return err
}
} else {
if err := c.createPortworxPodDisruptionBudget(cluster, ownerRef, nodeEnumerateResponse); err != nil {
return err
}
if err := c.deleteAllNodePodDisruptionBudgets(cluster, ownerRef); err != nil {
logrus.Warnf("failed to delete node poddisruptionbudgets if exists: %v", err)
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
}
}

return nil
Expand Down Expand Up @@ -365,3 +375,122 @@ func RegisterDisruptionBudgetComponent() {
func init() {
RegisterDisruptionBudgetComponent()
}

func (c *disruptionBudget) UpdateMinAvailableForNodePDB(cluster *corev1.StorageCluster,
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
ownerRef *metav1.OwnerReference,
nodeEnumerateResponse *api.SdkNodeEnumerateWithFiltersResponse,
k8sNodeList *v1.NodeList,
) error {

// GetNodesToUpgrade returns list of nodes that can be upgraded in parallel and the map of px node to k8s node name, number of nodes with PDB 0 + down nodes
// In the case when non disruptive upgrade is disabled, it returns all cordoned nodes which aren't already selected for the upgrade
nodesToUpgrade, cordonedPxNodesMap, numPxNodesDown, err := pxutil.GetNodesToUpgrade(cluster, nodeEnumerateResponse, k8sNodeList, c.k8sClient, c.sdkConn)
if err != nil {
return err
}
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved

// If user has mentioned minimum nodes that need to be running, then honor that value
storageNodesCount, err := pxutil.CountStorageNodes(cluster, c.sdkConn, c.k8sClient, nodeEnumerateResponse)
if err != nil {
c.closeSdkConn()
return err
}
userProvidedMinValue, err := pxutil.MinAvailableForStoragePDB(cluster)
if err != nil {
logrus.Warnf("Invalid value for annotation %s: %v", pxutil.AnnotationStoragePodDisruptionBudget, err)
userProvidedMinValue = -2
}

// Calculate the minimum number of nodes that should be available
quorumValue := int(math.Floor(float64(storageNodesCount)/2) + 1)
calculatedMinAvailable := quorumValue
// When non disruptive upgrades is disabled
if cluster.Annotations != nil && cluster.Annotations[pxutil.AnnotationsDisableNonDisruptiveUpgrade] == "true" {
if cluster.Annotations[pxutil.AnnotationStoragePodDisruptionBudget] == "" {
calculatedMinAvailable = storageNodesCount - 1
} else if (userProvidedMinValue < quorumValue || userProvidedMinValue >= storageNodesCount) && userProvidedMinValue != c.annotatedMinAvailable {
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
calculatedMinAvailable = storageNodesCount - 1
errmsg := fmt.Sprintf("Invalid minAvailable annotation value for storage pod disruption budget. Using default value: %d", calculatedMinAvailable)
c.recorder.Event(cluster, v1.EventTypeWarning, util.InvalidMinAvailable, errmsg)
} else if userProvidedMinValue >= quorumValue && userProvidedMinValue < storageNodesCount {
calculatedMinAvailable = userProvidedMinValue
}
} else {
// When non disruptive upgrades is enabled
if userProvidedMinValue >= storageNodesCount && userProvidedMinValue != c.annotatedMinAvailable {
piyush-nimbalkar marked this conversation as resolved.
Show resolved Hide resolved
errmsg := fmt.Sprintf("Invalid minAvailable annotation value for storage pod disruption budget. Using default value: %d", calculatedMinAvailable)
c.recorder.Event(cluster, v1.EventTypeWarning, util.InvalidMinAvailable, errmsg)
} else if userProvidedMinValue >= quorumValue && userProvidedMinValue < storageNodesCount {
calculatedMinAvailable = userProvidedMinValue
}
}
c.annotatedMinAvailable = userProvidedMinValue
errors := []error{}
downNodesCount := numPxNodesDown
// Update minAvailable to 0 for nodes in nodesToUpgrade
for _, node := range nodesToUpgrade {
// Ensure that portworx quorum or valid minAvailable provided by user is always maintained
if downNodesCount >= storageNodesCount-calculatedMinAvailable {
break
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
}
k8snode := cordonedPxNodesMap[node]
PDBName := "px-" + k8snode
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
minAvailable := intstr.FromInt(0)
pdb := &policyv1.PodDisruptionBudget{
ObjectMeta: metav1.ObjectMeta{
Name: PDBName,
Namespace: cluster.Namespace,
OwnerReferences: []metav1.OwnerReference{*ownerRef},
},
Spec: policyv1.PodDisruptionBudgetSpec{
MinAvailable: &minAvailable,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
constants.LabelKeyClusterName: cluster.Name,
constants.OperatorLabelNodeNameKey: node,
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
}
err = k8sutil.CreateOrUpdatePodDisruptionBudget(c.k8sClient, pdb, ownerRef)
if err != nil {
logrus.Warnf("Failed to update PDB for node %s: %v", node, err)
errors = append(errors, err)
} else {
downNodesCount++
}
}
return utilerrors.NewAggregate(errors)
piyush-nimbalkar marked this conversation as resolved.
Show resolved Hide resolved

}

func (c *disruptionBudget) deleteClusterPodDisruptionBudget(cluster *corev1.StorageCluster, ownerRef *metav1.OwnerReference) error {

err := k8sutil.DeletePodDisruptionBudget(c.k8sClient, "px-storage", cluster.Namespace, *ownerRef)
if err != nil {
logrus.Warnf("Failed to delete cluster PDB %s: %v", "px-storage", err)
svijaykumar-px marked this conversation as resolved.
Show resolved Hide resolved
return err
}

return nil
}

func (c *disruptionBudget) deleteAllNodePodDisruptionBudgets(cluster *corev1.StorageCluster, ownerRef *metav1.OwnerReference) error {
errors := []error{}
// Get the list of poddisruptionbudgets
pdbList := &policyv1.PodDisruptionBudgetList{}
err := c.k8sClient.List(context.TODO(), pdbList, client.InNamespace(cluster.Namespace))
if err != nil {
logrus.Warnf("failed to list poddisruptionbudgets: %v", err)
}
for _, pdb := range pdbList.Items {
if strings.HasPrefix(pdb.Name, "px") && pdb.Name != "px-storage" && pdb.Name != "px-kvdb" {
err := k8sutil.DeletePodDisruptionBudget(c.k8sClient, pdb.Name, cluster.Namespace, *ownerRef)
if err != nil {
logrus.Warnf("Failed to delete node PDB %s: %v", pdb.Name, err)
errors = append(errors, err)
}
}
}
return utilerrors.NewAggregate(errors)
}
Loading
Loading