Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/google/gofuzz v1.2.0 // indirect
github.com/openshift/api v0.0.0-20210831091943-07e756545ac1
github.com/openshift/api v0.0.0-20210927171657-636513e97fda
github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37
github.com/openshift/client-go v0.0.0-20210831095141-e19a065e79f7
github.com/openshift/library-go v0.0.0-20210909124717-1c18e732a117
github.com/openshift/client-go v0.0.0-20210916133943-9acee1a0fb83
github.com/openshift/library-go v0.0.0-20210929123655-f91754363286
github.com/prometheus/client_golang v1.11.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
Expand Down
54 changes: 48 additions & 6 deletions go.sum

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package configobservercontroller

import (
"k8s.io/apimachinery/pkg/util/sets"
kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/tools/cache"

Expand All @@ -16,6 +17,7 @@ import (
"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/operator/configobservation/deployimages"
"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/operator/configobservation/images"
"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/operator/configobservation/network"
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
)

// NewConfigObserver initializes a new configuration observer.
Expand All @@ -30,10 +32,11 @@ func NewConfigObserver(
operatorClient,
eventRecorder,
configobservation.Listers{
ImageConfigLister: configInformers.Config().V1().Images().Lister(),
BuildConfigLister: configInformers.Config().V1().Builds().Lister(),
NetworkLister: configInformers.Config().V1().Networks().Lister(),
ConfigMapLister: kubeInformersForOperatorNamespace.Core().V1().ConfigMaps().Lister(),
ImageConfigLister: configInformers.Config().V1().Images().Lister(),
BuildConfigLister: configInformers.Config().V1().Builds().Lister(),
NetworkLister: configInformers.Config().V1().Networks().Lister(),
FeatureGateLister_: configInformers.Config().V1().FeatureGates().Lister(),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
FeatureGateLister_: configInformers.Config().V1().FeatureGates().Lister(),
FeatureGateLister: configInformers.Config().V1().FeatureGates().Lister(),

ConfigMapLister: kubeInformersForOperatorNamespace.Core().V1().ConfigMaps().Lister(),
PreRunCachesSynced: []cache.InformerSynced{
configInformers.Config().V1().Builds().Informer().HasSynced,
configInformers.Config().V1().Images().Informer().HasSynced,
Expand All @@ -48,6 +51,7 @@ func NewConfigObserver(
builds.ObserveBuildControllerConfig,
network.ObserveExternalIPAutoAssignCIDRs,
deployimages.ObserveControllerManagerImagesConfig,
featuregates.NewObserveFeatureFlagsFunc(sets.NewString("BuildCSIVolumes"), sets.String{}, []string{"featureGates"}),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looks good

)

return c
Expand Down
5 changes: 5 additions & 0 deletions pkg/operator/configobservation/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type Listers struct {
BuildConfigLister configlistersv1.BuildLister
ConfigMapLister corelistersv1.ConfigMapLister
NetworkLister configlistersv1.NetworkLister
FeatureGateLister_ configlistersv1.FeatureGateLister
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Accidental underscore?

Suggested change
FeatureGateLister_ configlistersv1.FeatureGateLister
FeatureGateLister configlistersv1.FeatureGateLister

PreRunCachesSynced []cache.InformerSynced
}

Expand All @@ -23,3 +24,7 @@ func (l Listers) ResourceSyncer() resourcesynccontroller.ResourceSyncer {
func (l Listers) PreRunHasSynced() []cache.InformerSynced {
return l.PreRunCachesSynced
}

func (l Listers) FeatureGateLister() configlistersv1.FeatureGateLister {
return l.FeatureGateLister_
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
return l.FeatureGateLister_
return l.FeatureGateLister

}
3 changes: 2 additions & 1 deletion vendor/github.com/openshift/api/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading