Skip to content

Bug 2050946: pkg/featurechangestopper: Seed queue to guard against incorrect startingTechPreviewState #736

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 2 commits into from
Feb 7, 2022
Merged

Bug 2050946: pkg/featurechangestopper: Seed queue to guard against incorrect startingTechPreviewState #736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79742d7
pkg/featurechangestopper: Seed queue to guard against incorrect start…
wking Feb 5, 2022
a44a3c0
pkg/featurechangestopper: Avoid looping on not-found
wking Feb 6, 2022
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
12 changes: 8 additions & 4 deletions pkg/featurechangestopper/techpreviewchangestopper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
configv1 "github.com/openshift/api/config/v1"
configinformersv1 "github.com/openshift/client-go/config/informers/externalversions/config/v1"
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/cache"
Expand Down Expand Up @@ -40,6 +41,7 @@ func New(
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "feature-gate-stopper"),
}

c.queue.Add("cluster") // seed an initial sync, in case startingTechPreviewState is wrong
featureGateInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) {
c.queue.Add("cluster")
Expand All @@ -59,19 +61,21 @@ func New(
// processNextWorkItem caller handling the queue management. It returns
// done when there will be no more work (because the feature gate changed).
func (c *TechPreviewChangeStopper) syncHandler(ctx context.Context) (done bool, err error) {
featureGates, err := c.featureGateLister.Get("cluster")
if err != nil {
var current configv1.FeatureSet
if featureGates, err := c.featureGateLister.Get("cluster"); err == nil {
current = featureGates.Spec.FeatureSet
} else if !apierrors.IsNotFound(err) {
return false, err
}
techPreviewNowSet := featureGates.Spec.FeatureSet == configv1.TechPreviewNoUpgrade
techPreviewNowSet := current == configv1.TechPreviewNoUpgrade
if techPreviewNowSet != c.startingTechPreviewState {
var action string
if c.shutdownFn == nil {
action = "no shutdown function configured"
} else {
action = "requesting shutdown"
}
klog.Infof("TechPreviewNoUpgrade was %t, but the current feature set is %q; %s.", c.startingTechPreviewState, featureGates.Spec.FeatureSet, action)
klog.Infof("TechPreviewNoUpgrade was %t, but the current feature set is %q; %s.", c.startingTechPreviewState, current, action)
if c.shutdownFn != nil {
c.shutdownFn()
}
Expand Down