Skip to content

bug 2005901: staticpod builder: initialize operand label selector separately #1281

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-merge-robot merged 1 commit into from
Jan 11, 2022
Merged

bug 2005901: staticpod builder: initialize operand label selector separately #1281

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
30 changes: 17 additions & 13 deletions pkg/operator/staticpod/controller/guard/guard_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type GuardController struct {
targetNamespace, podResourcePrefix string
operatorName string
readyzPort string
operandPodLabelSelector labels.Selector

nodeLister corelisterv1.NodeLister
podLister corelisterv1.PodLister
Expand All @@ -50,7 +51,9 @@ type GuardController struct {
}

func NewGuardController(
targetNamespace, podResourcePrefix string,
targetNamespace string,
operandPodLabelSelector labels.Selector,
podResourcePrefix string,
operatorName string,
readyzPort string,
kubeInformersForTargetNamespace informers.SharedInformerFactory,
Expand All @@ -62,17 +65,18 @@ func NewGuardController(
createConditionalFunc func() (bool, error),
) factory.Controller {
c := &GuardController{
targetNamespace: targetNamespace,
podResourcePrefix: podResourcePrefix,
operatorName: operatorName,
readyzPort: readyzPort,
nodeLister: kubeInformersClusterScoped.Core().V1().Nodes().Lister(),
podLister: kubeInformersForTargetNamespace.Core().V1().Pods().Lister(),
podGetter: podGetter,
pdbGetter: pdbGetter,
pdbLister: kubeInformersForTargetNamespace.Policy().V1().PodDisruptionBudgets().Lister(),
installerPodImageFn: getInstallerPodImageFromEnv,
createConditionalFunc: createConditionalFunc,
targetNamespace: targetNamespace,
operandPodLabelSelector: operandPodLabelSelector,
podResourcePrefix: podResourcePrefix,
operatorName: operatorName,
readyzPort: readyzPort,
nodeLister: kubeInformersClusterScoped.Core().V1().Nodes().Lister(),
podLister: kubeInformersForTargetNamespace.Core().V1().Pods().Lister(),
podGetter: podGetter,
pdbGetter: pdbGetter,
pdbLister: kubeInformersForTargetNamespace.Policy().V1().PodDisruptionBudgets().Lister(),
installerPodImageFn: getInstallerPodImageFromEnv,
createConditionalFunc: createConditionalFunc,
}

return factory.New().WithInformers(
Expand Down Expand Up @@ -162,7 +166,7 @@ func (c *GuardController) sync(ctx context.Context, syncCtx factory.SyncContext)
return err
}

pods, err := c.podLister.Pods(c.targetNamespace).List(labels.SelectorFromSet(labels.Set{"app": c.podResourcePrefix}))
pods, err := c.podLister.Pods(c.targetNamespace).List(c.operandPodLabelSelector)
if err != nil {
return err
}
Expand Down
46 changes: 24 additions & 22 deletions pkg/operator/staticpod/controller/guard/guard_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,17 +288,18 @@ func TestRenderGuardPod(t *testing.T) {
eventRecorder := events.NewRecorder(kubeClient.CoreV1().Events("test"), "test-operator", &corev1.ObjectReference{})

ctrl := &GuardController{
targetNamespace: "test",
podResourcePrefix: "operand",
operatorName: "operator",
readyzPort: "99999",
nodeLister: kubeInformers.Core().V1().Nodes().Lister(),
podLister: kubeInformers.Core().V1().Pods().Lister(),
podGetter: kubeClient.CoreV1(),
pdbGetter: kubeClient.PolicyV1(),
pdbLister: kubeInformers.Policy().V1().PodDisruptionBudgets().Lister(),
installerPodImageFn: getInstallerPodImageFromEnv,
createConditionalFunc: IsSNOCheckFnc(lister),
targetNamespace: "test",
podResourcePrefix: "operand",
operatorName: "operator",
operandPodLabelSelector: labels.Set{"app": "operand"}.AsSelector(),
readyzPort: "99999",
nodeLister: kubeInformers.Core().V1().Nodes().Lister(),
podLister: kubeInformers.Core().V1().Pods().Lister(),
podGetter: kubeClient.CoreV1(),
pdbGetter: kubeClient.PolicyV1(),
pdbLister: kubeInformers.Policy().V1().PodDisruptionBudgets().Lister(),
installerPodImageFn: getInstallerPodImageFromEnv,
createConditionalFunc: IsSNOCheckFnc(lister),
}

ctx, cancel := context.WithCancel(context.TODO())
Expand Down Expand Up @@ -404,17 +405,18 @@ func TestRenderGuardPodPortChanged(t *testing.T) {
eventRecorder := events.NewRecorder(kubeClient.CoreV1().Events("test"), "test-operator", &corev1.ObjectReference{})

ctrl := &GuardController{
targetNamespace: "test",
podResourcePrefix: "operand",
operatorName: "operator",
readyzPort: "99999",
nodeLister: kubeInformers.Core().V1().Nodes().Lister(),
podLister: kubeInformers.Core().V1().Pods().Lister(),
podGetter: kubeClient.CoreV1(),
pdbGetter: kubeClient.PolicyV1(),
pdbLister: kubeInformers.Policy().V1().PodDisruptionBudgets().Lister(),
installerPodImageFn: getInstallerPodImageFromEnv,
createConditionalFunc: IsSNOCheckFnc(lister),
targetNamespace: "test",
podResourcePrefix: "operand",
operandPodLabelSelector: labels.Set{"app": "operand"}.AsSelector(),
operatorName: "operator",
readyzPort: "99999",
nodeLister: kubeInformers.Core().V1().Nodes().Lister(),
podLister: kubeInformers.Core().V1().Pods().Lister(),
podGetter: kubeClient.CoreV1(),
pdbGetter: kubeClient.PolicyV1(),
pdbLister: kubeInformers.Policy().V1().PodDisruptionBudgets().Lister(),
installerPodImageFn: getInstallerPodImageFromEnv,
createConditionalFunc: IsSNOCheckFnc(lister),
}

ctx, cancel := context.WithCancel(context.TODO())
Expand Down
62 changes: 38 additions & 24 deletions pkg/operator/staticpod/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,12 @@ func NewBuilder(
type Builder interface {
WithEvents(eventRecorder events.Recorder) Builder
WithVersioning(operandName string, versionRecorder status.VersionGetter) Builder
WithOperandPodLabelSelector(labelSelector labels.Selector) Builder
WithRevisionedResources(operandNamespace, staticPodName string, revisionConfigMaps, revisionSecrets []revisioncontroller.RevisionResource) Builder
WithUnrevisionedCerts(certDir string, certConfigMaps, certSecrets []installer.UnrevisionedResource) Builder
WithInstaller(command []string) Builder
WithMinReadyDuration(minReadyDuration time.Duration) Builder
WithStartupMonitor(enabledStartupMonitor func() (bool, error), operandPodLabelSelector labels.Selector) Builder
WithStartupMonitor(enabledStartupMonitor func() (bool, error)) Builder
Copy link
Contributor

@p0lyn0mial p0lyn0mial Jan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it will become:

staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces).
...
WithStartupMonitor(startupmonitorreadiness.IsStartupMonitorEnabledFunction(configInformers.Config().V1().Infrastructures().Lister(), operatorClient)).
WithOperandPodLabelSelector(labels.Set{"apiserver": "true"}.AsSelector())

Copy link
Member Author

@ingvagabund ingvagabund Jan 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.


// WithCustomInstaller allows mutating the installer pod definition just before
// the installer pod is created for a revision.
Expand All @@ -113,6 +114,11 @@ func (b *staticPodOperatorControllerBuilder) WithVersioning(operandName string,
return b
}

func (b *staticPodOperatorControllerBuilder) WithOperandPodLabelSelector(labelSelector labels.Selector) Builder {
b.operandPodLabelSelector = labelSelector
return b
}

func (b *staticPodOperatorControllerBuilder) WithRevisionedResources(operandNamespace, staticPodName string, revisionConfigMaps, revisionSecrets []revisioncontroller.RevisionResource) Builder {
b.operandNamespace = operandNamespace
b.staticPodName = staticPodName
Expand Down Expand Up @@ -141,9 +147,8 @@ func (b *staticPodOperatorControllerBuilder) WithMinReadyDuration(minReadyDurati
return b
}

func (b *staticPodOperatorControllerBuilder) WithStartupMonitor(enabledStartupMonitor func() (bool, error), operandPodLabelSelector labels.Selector) Builder {
func (b *staticPodOperatorControllerBuilder) WithStartupMonitor(enabledStartupMonitor func() (bool, error)) Builder {
b.enableStartMonitor = enabledStartupMonitor
b.operandPodLabelSelector = operandPodLabelSelector
return b
}

Expand Down Expand Up @@ -285,14 +290,18 @@ func (b *staticPodOperatorControllerBuilder) ToControllers() (manager.Controller
eventRecorder,
), 1)

manager.WithController(staticpodfallback.New(
b.operandNamespace,
b.operandPodLabelSelector,
b.staticPodOperatorClient,
b.kubeInformers,
b.enableStartMonitor,
b.eventRecorder,
), 1)
if b.operandPodLabelSelector.Empty() {
errs = append(errs, fmt.Errorf("missing OperandPodLabelSelector when running StaticPodFallbackConditionController; cannot proceed"))
} else {
manager.WithController(staticpodfallback.New(
b.operandNamespace,
b.operandPodLabelSelector,
b.staticPodOperatorClient,
b.kubeInformers,
b.enableStartMonitor,
b.eventRecorder,
), 1)
}

manager.WithController(node.NewNodeController(
b.staticPodOperatorClient,
Expand All @@ -317,19 +326,24 @@ func (b *staticPodOperatorControllerBuilder) ToControllers() (manager.Controller
manager.WithController(loglevel.NewClusterOperatorLoggingController(b.staticPodOperatorClient, eventRecorder), 1)

if len(b.operatorNamespace) > 0 && len(b.operatorName) > 0 && len(b.readyzPort) > 0 {
manager.WithController(guard.NewGuardController(
b.operandNamespace,
b.staticPodName,
b.operatorName,
b.readyzPort,
operandInformers,
clusterInformers,
b.staticPodOperatorClient,
podClient,
pdbClient,
eventRecorder,
b.guardCreateConditionalFunc,
), 1)
if b.operandPodLabelSelector.Empty() {
errs = append(errs, fmt.Errorf("missing OperandPodLabelSelector when running GuardController; cannot proceed"))
} else {
manager.WithController(guard.NewGuardController(
b.operandNamespace,
b.operandPodLabelSelector,
b.staticPodName,
b.operatorName,
b.readyzPort,
operandInformers,
clusterInformers,
b.staticPodOperatorClient,
podClient,
pdbClient,
eventRecorder,
b.guardCreateConditionalFunc,
), 1)
}
}

return manager, errors.NewAggregate(errs)
Expand Down