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

[OCPBUGS-50992]: Filter out unreachable taints from tolerations #1990

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[OCPBUGS-50992]: Filter out unreachable taints from tolerations #1990

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18697e8
Filter out unreachable taints from tolerations
midu16 Mar 11, 2025
f41482b
fixing syntax issue on line 949
midu16 Apr 2, 2025
1dc0090
Merge branch 'openshift:master' into master
midu16 Apr 2, 2025
cd6a9c3
fixing syntax issue on line 949
midu16 Apr 2, 2025
96859e5
sintax fix
midu16 Apr 3, 2025
dd2eb43
defining constat
midu16 Apr 3, 2025
2849b32
revert initial change
midu16 Apr 3, 2025
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
43 changes: 35 additions & 8 deletions pkg/cli/admin/mustgather/mustgather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ import (

const (
gatherContainerName = "gather"
unreachableTaintKey = "node.kubernetes.io/unreachable"

)

var (
Expand Down Expand Up @@ -941,6 +943,38 @@ func (o *MustGatherOptions) newPod(node, image string, hasMaster bool) *corev1.P

cleanedSourceDir := path.Clean(o.SourceDir)
volumeUsageChecker := fmt.Sprintf(volumeUsageCheckerScript, cleanedSourceDir, cleanedSourceDir, o.VolumePercentage, o.VolumePercentage, executedCommand)
//fmt.Sprintf(volumeUsageCheckerScript,cleanedSourceDir,o.VolumePercentage,executedCommand,)

excludedTaints := []corev1.Taint{
{Key: unreachableTaintKey, Effect: corev1.TaintEffectNoExecute},
{Key: unreachableTaintKey, Effect: corev1.TaintEffectNoSchedule},
}

var tolerations []corev1.Toleration
if node == "" && hasMaster {
tolerations = append(tolerations, corev1.Toleration{
Key: "node-role.kubernetes.io/master",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoSchedule,
})
}

tolerations = append(tolerations, corev1.Toleration{
Key: "node.kubernetes.io/not-ready",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoSchedule,
})

filteredTolerations := make([]corev1.Toleration, 0)
TolerationLoop:
for _, tol := range tolerations {
for _, excluded := range excludedTaints {
if tol.ToleratesTaint(&excluded) {
continue TolerationLoop
}
}
filteredTolerations = append(filteredTolerations, tol)
}

ret := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -1016,14 +1050,7 @@ func (o *MustGatherOptions) newPod(node, image string, hasMaster bool) *corev1.P
HostNetwork: o.HostNetwork,
NodeSelector: nodeSelector,
TerminationGracePeriodSeconds: &zero,
Tolerations: []corev1.Toleration{
{
// An empty key with operator Exists matches all keys,
// values and effects which means this will tolerate everything.
// As noted in https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
Operator: "Exists",
},
},
Tolerations: filteredTolerations,
},
}
if o.HostNetwork {
Expand Down