Skip to content

Bug 2103786: drain controller: don't skip the MCC pod drain #3212

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

Merged
openshift-ci merged 1 commit into from
Jul 6, 2022
Merged

Bug 2103786: drain controller: don't skip the MCC pod drain #3212

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
5 changes: 0 additions & 5 deletions manifests/machineconfigcontroller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ spec:
- "start"
- "--resourcelock-namespace={{.TargetNamespace}}"
- "--v=2"
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
resources:
requests:
cpu: 20m
Expand Down
16 changes: 0 additions & 16 deletions pkg/controller/drain/drain_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"os"
"strings"
"time"

Expand Down Expand Up @@ -68,7 +67,6 @@ type Controller struct {

queue workqueue.RateLimitingInterface
ongoingDrains map[string]time.Time
podName string
}

// New returns a new node controller.
Expand Down Expand Up @@ -122,12 +120,6 @@ func (ctrl *Controller) Run(workers int, stopCh <-chan struct{}) {
return
}

podName, ok := os.LookupEnv("POD_NAME")
if !ok || podName == "" {
glog.Fatalf("pod name is required for controller drainer")
}
ctrl.podName = podName

ongoingDrains := make(map[string]time.Time)
ctrl.ongoingDrains = ongoingDrains

Expand Down Expand Up @@ -269,14 +261,6 @@ func (ctrl *Controller) syncNode(key string) error {
}
ctrl.logNode(node, "%s pod %s/%s", verbStr, pod.Namespace, pod.Name)
},
AdditionalFilters: []drain.PodFilter{
func(pod corev1.Pod) drain.PodDeleteStatus {
if pod.Name == ctrl.podName {
return drain.MakePodDeleteStatusSkip()
}
return drain.MakePodDeleteStatusOkay()
},
},
Out: writer{glog.Info},
ErrOut: writer{glog.Error},
Ctx: context.TODO(),
Expand Down