Skip to content

Commit 8a2270a

Browse files
csrwngcsrwng
committed
Revert "Merge pull request #1026 from deepsm007/expose-chunksize"
This reverts commit e5f344e, reversing changes made to 3c5fa91.
1 parent e5f344e commit 8a2270a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+40
-3407
lines changed

‎manifests/02-rbac.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ rules:
4040
- apiGroups:
4141
- config.openshift.io
4242
resources:
43-
- clusterversions
44-
- featuregates
4543
- infrastructures
4644
verbs:
4745
- get

‎manifests/07-operator-ibm-cloud-managed.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ spec:
5050
value: quay.io/openshift/origin-cli:v4.0
5151
- name: AZURE_ENVIRONMENT_FILEPATH
5252
value: /tmp/azurestackcloud.json
53-
- name: OPERATOR_IMAGE_VERSION
54-
value: 0.0.1-snapshot
5553
image: docker.io/openshift/origin-cluster-image-registry-operator:latest
5654
imagePullPolicy: IfNotPresent
5755
name: cluster-image-registry-operator

‎manifests/07-operator.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ spec:
7777
value: quay.io/openshift/origin-cli:v4.0
7878
- name: AZURE_ENVIRONMENT_FILEPATH
7979
value: /tmp/azurestackcloud.json
80-
- name: OPERATOR_IMAGE_VERSION
81-
value: 0.0.1-snapshot
8280
terminationMessagePolicy: FallbackToLogsOnError
8381
volumeMounts:
8482
- name: trusted-ca

‎pkg/operator/azurepathfixcontroller.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
configlisters "github.com/openshift/client-go/config/listers/config/v1"
3131
imageregistryv1informers "github.com/openshift/client-go/imageregistry/informers/externalversions/imageregistry/v1"
3232
imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
33-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
3433
"github.com/openshift/library-go/pkg/operator/v1helpers"
3534

3635
"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -52,8 +51,6 @@ type AzurePathFixController struct {
5251

5352
cachesToSync []cache.InformerSynced
5453
queue workqueue.RateLimitingInterface
55-
56-
featureGateAccessor featuregates.FeatureGateAccess
5754
}
5855

5956
func NewAzurePathFixController(
@@ -67,7 +64,6 @@ func NewAzurePathFixController(
6764
proxyInformer configv1informers.ProxyInformer,
6865
openshiftConfigInformer corev1informers.ConfigMapInformer,
6966
podInformer corev1informers.PodInformer,
70-
featureGateAccessor featuregates.FeatureGateAccess,
7167
) (*AzurePathFixController, error) {
7268
c := &AzurePathFixController{
7369
batchClient: batchClient,
@@ -81,7 +77,6 @@ func NewAzurePathFixController(
8177
openshiftConfigLister: openshiftConfigInformer.Lister().ConfigMaps(defaults.OpenShiftConfigNamespace),
8278
kubeconfig: kubeconfig,
8379
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "AzurePathFixController"),
84-
featureGateAccessor: featureGateAccessor,
8580
}
8681

8782
if _, err := jobInformer.Informer().AddEventHandler(c.eventHandler()); err != nil {

‎pkg/operator/controller.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
imageregistryinformers "github.com/openshift/client-go/imageregistry/informers/externalversions"
2929
routeclient "github.com/openshift/client-go/route/clientset/versioned"
3030
routeinformers "github.com/openshift/client-go/route/informers/externalversions"
31-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
3231
"github.com/openshift/library-go/pkg/operator/events"
3332

3433
regopclient "github.com/openshift/cluster-image-registry-operator/pkg/client"
@@ -79,13 +78,12 @@ func NewController(
7978
configInformerFactory configinformers.SharedInformerFactory,
8079
regopInformerFactory imageregistryinformers.SharedInformerFactory,
8180
routeInformerFactory routeinformers.SharedInformerFactory,
82-
featureGateAccessor featuregates.FeatureGateAccess,
8381
) (*Controller, error) {
8482
listers := &regopclient.Listers{}
8583
clients := &regopclient.Clients{}
8684
c := &Controller{
8785
kubeconfig: kubeconfig,
88-
generator: resource.NewGenerator(eventRecorder, kubeconfig, clients, listers, featureGateAccessor),
86+
generator: resource.NewGenerator(eventRecorder, kubeconfig, clients, listers),
8987
workqueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "Changes"),
9088
listers: listers,
9189
clients: clients,

‎pkg/operator/imageregistrycertificates.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
configv1listers "github.com/openshift/client-go/config/listers/config/v1"
2121
imageregistryv1informers "github.com/openshift/client-go/imageregistry/informers/externalversions/imageregistry/v1"
2222
imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
23-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
2423
"github.com/openshift/library-go/pkg/operator/v1helpers"
2524

2625
"github.com/openshift/cluster-image-registry-operator/pkg/client"
@@ -42,8 +41,6 @@ type ImageRegistryCertificatesController struct {
4241

4342
cachesToSync []cache.InformerSynced
4443
queue workqueue.RateLimitingInterface
45-
46-
featureGateAccessor featuregates.FeatureGateAccess
4744
}
4845

4946
func NewImageRegistryCertificatesController(
@@ -152,7 +149,7 @@ func (c *ImageRegistryCertificatesController) processNextWorkItem() bool {
152149
func (c *ImageRegistryCertificatesController) sync() error {
153150
ctx := context.TODO()
154151

155-
g := resource.NewGeneratorCAConfig(c.configMapLister, c.imageConfigLister, c.openshiftConfigLister, c.serviceLister, c.imageRegistryConfigLister, c.storageListers, c.kubeconfig, c.coreClient, c.featureGateAccessor)
152+
g := resource.NewGeneratorCAConfig(c.configMapLister, c.imageConfigLister, c.openshiftConfigLister, c.serviceLister, c.imageRegistryConfigLister, c.storageListers, c.kubeconfig, c.coreClient)
156153
err := resource.ApplyMutator(g)
157154
if err != nil {
158155
_, _, updateError := v1helpers.UpdateStatus(
@@ -177,7 +174,6 @@ func (c *ImageRegistryCertificatesController) sync() error {
177174
c.storageListers,
178175
c.kubeconfig,
179176
c.coreClient,
180-
c.featureGateAccessor,
181177
)
182178
err = resource.ApplyMutator(g)
183179
if err != nil {

‎pkg/operator/starter.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package operator
22

33
import (
44
"context"
5-
"fmt"
6-
"time"
75

86
kubeinformers "k8s.io/client-go/informers"
97
kubeclient "k8s.io/client-go/kubernetes"
@@ -19,10 +17,8 @@ import (
1917
imageregistryinformers "github.com/openshift/client-go/imageregistry/informers/externalversions"
2018
routeclient "github.com/openshift/client-go/route/clientset/versioned"
2119
routeinformers "github.com/openshift/client-go/route/informers/externalversions"
22-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
2320
"github.com/openshift/library-go/pkg/operator/events"
2421
"github.com/openshift/library-go/pkg/operator/loglevel"
25-
"github.com/openshift/library-go/pkg/operator/status"
2622

2723
"github.com/openshift/cluster-image-registry-operator/pkg/client"
2824
"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -72,24 +68,6 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
7268
}
7369
eventRecorder := events.NewKubeRecorder(kubeClient.CoreV1().Events(defaults.ImageRegistryOperatorNamespace), "image-registry-operator", controllerRef)
7470

75-
desiredVersion := status.VersionForOperatorFromEnv()
76-
missingVersion := "0.0.1-snapshot"
77-
78-
// By default, this will exit(0) the process if the featuregates ever change to a different set of values.
79-
featureGateAccessor := featuregates.NewFeatureGateAccess(desiredVersion, missingVersion, configInformers.Config().V1().ClusterVersions(), configInformers.Config().V1().FeatureGates(), eventRecorder)
80-
81-
go featureGateAccessor.Run(ctx)
82-
configInformers.Start(ctx.Done())
83-
84-
select {
85-
case <-featureGateAccessor.InitialFeatureGatesObserved():
86-
featureGates, _ := featureGateAccessor.CurrentFeatureGates()
87-
klog.Infof("FeatureGates initialized: knownFeatureGates=%v", featureGates.KnownFeatures())
88-
case <-time.After(1 * time.Minute):
89-
klog.Errorf("timed out waiting for FeatureGate detection")
90-
return fmt.Errorf("timed out waiting for FeatureGate detection")
91-
}
92-
9371
controller, err := NewController(
9472
eventRecorder,
9573
kubeconfig,
@@ -104,7 +82,6 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
10482
configInformers,
10583
imageregistryInformers,
10684
routeInformers,
107-
featureGateAccessor,
10885
)
10986
if err != nil {
11087
return err
@@ -202,7 +179,6 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
202179
configInformers.Config().V1().Proxies(),
203180
kubeInformersForOpenShiftConfig.Core().V1().ConfigMaps(),
204181
kubeInformers.Core().V1().Pods(),
205-
featureGateAccessor,
206182
)
207183
if err != nil {
208184
return err

‎pkg/resource/caconfig.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
operatorv1 "github.com/openshift/api/operator/v1"
1818
configlisters "github.com/openshift/client-go/config/listers/config/v1"
1919
imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
20-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
2120

2221
"github.com/openshift/cluster-image-registry-operator/pkg/client"
2322
"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -35,7 +34,6 @@ type generatorCAConfig struct {
3534
storageListers *client.StorageListers
3635
kubeconfig *restclient.Config
3736
client coreset.CoreV1Interface
38-
featureGateAccessor featuregates.FeatureGateAccess
3937
}
4038

4139
func NewGeneratorCAConfig(
@@ -47,7 +45,6 @@ func NewGeneratorCAConfig(
4745
storageListers *client.StorageListers,
4846
kubeconfig *restclient.Config,
4947
client coreset.CoreV1Interface,
50-
featureGateAccessor featuregates.FeatureGateAccess,
5148
) Mutator {
5249
return &generatorCAConfig{
5350
lister: lister,
@@ -58,7 +55,6 @@ func NewGeneratorCAConfig(
5855
storageListers: storageListers,
5956
kubeconfig: kubeconfig,
6057
client: client,
61-
featureGateAccessor: featureGateAccessor,
6258
}
6359
}
6460

@@ -88,7 +84,7 @@ func (gcac *generatorCAConfig) storageDriver() (storage.Driver, bool, error) {
8884
return nil, false, nil
8985
}
9086

91-
driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, gcac.kubeconfig, gcac.storageListers, gcac.featureGateAccessor)
87+
driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, gcac.kubeconfig, gcac.storageListers)
9288
if err == storage.ErrStorageNotConfigured || storage.IsMultiStoragesError(err) {
9389
return nil, false, nil
9490
} else if err != nil {

‎pkg/resource/generator.go

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"k8s.io/klog/v2"
1616

1717
imageregistryv1 "github.com/openshift/api/imageregistry/v1"
18-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
1918
"github.com/openshift/library-go/pkg/operator/events"
2019

2120
"github.com/openshift/cluster-image-registry-operator/pkg/client"
@@ -66,22 +65,20 @@ func ApplyMutator(gen Mutator) error {
6665
})
6766
}
6867

69-
func NewGenerator(eventRecorder events.Recorder, kubeconfig *rest.Config, clients *client.Clients, listers *client.Listers, featureGateAccessor featuregates.FeatureGateAccess) *Generator {
68+
func NewGenerator(eventRecorder events.Recorder, kubeconfig *rest.Config, clients *client.Clients, listers *client.Listers) *Generator {
7069
return &Generator{
71-
eventRecorder: eventRecorder,
72-
kubeconfig: kubeconfig,
73-
listers: listers,
74-
clients: clients,
75-
featureGateAccessor: featureGateAccessor,
70+
eventRecorder: eventRecorder,
71+
kubeconfig: kubeconfig,
72+
listers: listers,
73+
clients: clients,
7674
}
7775
}
7876

7977
type Generator struct {
80-
eventRecorder events.Recorder
81-
kubeconfig *rest.Config
82-
listers *client.Listers
83-
clients *client.Clients
84-
featureGateAccessor featuregates.FeatureGateAccess
78+
eventRecorder events.Recorder
79+
kubeconfig *rest.Config
80+
listers *client.Listers
81+
clients *client.Clients
8582
}
8683

8784
func (g *Generator) listRoutes(cr *imageregistryv1.Config) []Mutator {
@@ -98,7 +95,7 @@ func (g *Generator) listRoutes(cr *imageregistryv1.Config) []Mutator {
9895
}
9996

10097
func (g *Generator) List(cr *imageregistryv1.Config) ([]Mutator, error) {
101-
driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
98+
driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers)
10299
if err != nil && err != storage.ErrStorageNotConfigured {
103100
return nil, err
104101
} else if err == storage.ErrStorageNotConfigured {
@@ -128,13 +125,13 @@ func (g *Generator) List(cr *imageregistryv1.Config) ([]Mutator, error) {
128125
func (g *Generator) syncStorage(cr *imageregistryv1.Config) error {
129126
var runCreate bool
130127
// Create a driver with the current configuration
131-
driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
128+
driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers)
132129
if err == storage.ErrStorageNotConfigured {
133130
cr.Spec.Storage, _, err = storage.GetPlatformStorage(&g.listers.StorageListers)
134131
if err != nil {
135132
return fmt.Errorf("unable to get storage configuration from cluster install config: %s", err)
136133
}
137-
driver, err = storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
134+
driver, err = storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers)
138135
}
139136
if err != nil {
140137
return err
@@ -172,11 +169,11 @@ func (g *Generator) storageReconfigured(
172169
restCfg *rest.Config,
173170
listers *client.Listers,
174171
) bool {
175-
prev, err := storage.NewDriver(&regCfg.Status.Storage, restCfg, &listers.StorageListers, g.featureGateAccessor)
172+
prev, err := storage.NewDriver(&regCfg.Status.Storage, restCfg, &listers.StorageListers)
176173
if err != nil {
177174
return false
178175
}
179-
cur, err := storage.NewDriver(&regCfg.Spec.Storage, restCfg, &listers.StorageListers, g.featureGateAccessor)
176+
cur, err := storage.NewDriver(&regCfg.Spec.Storage, restCfg, &listers.StorageListers)
180177
if err != nil {
181178
return false
182179
}
@@ -292,7 +289,7 @@ func (g *Generator) Remove(cr *imageregistryv1.Config) error {
292289
klog.Infof("object %s deleted", Name(gen))
293290
}
294291

295-
driver, err := storage.NewDriver(&cr.Status.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
292+
driver, err := storage.NewDriver(&cr.Status.Storage, g.kubeconfig, &g.listers.StorageListers)
296293
if err == storage.ErrStorageNotConfigured {
297294
return nil
298295
} else if err != nil {

‎pkg/resource/imageregistryca.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
operatorv1 "github.com/openshift/api/operator/v1"
1818
configlisters "github.com/openshift/client-go/config/listers/config/v1"
1919
imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
20-
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
2120

2221
"github.com/openshift/cluster-image-registry-operator/pkg/client"
2322
"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -36,7 +35,6 @@ type generatorImageRegistryCA struct {
3635
storageListers *client.StorageListers
3736
kubeconfig *restclient.Config
3837
client coreset.CoreV1Interface
39-
featureGateAccessor featuregates.FeatureGateAccess
4038
}
4139

4240
func NewGeneratorImageRegistryCA(
@@ -49,7 +47,6 @@ func NewGeneratorImageRegistryCA(
4947
storageListers *client.StorageListers,
5048
kubeconfig *restclient.Config,
5149
client coreset.CoreV1Interface,
52-
featureGateAccessor featuregates.FeatureGateAccess,
5350
) Mutator {
5451
return &generatorImageRegistryCA{
5552
lister: lister,
@@ -61,7 +58,6 @@ func NewGeneratorImageRegistryCA(
6158
storageListers: storageListers,
6259
kubeconfig: kubeconfig,
6360
client: client,
64-
featureGateAccessor: featureGateAccessor,
6561
}
6662
}
6763

@@ -91,7 +87,7 @@ func (girca *generatorImageRegistryCA) storageDriver() (storage.Driver, bool, er
9187
return nil, false, nil
9288
}
9389

94-
driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, girca.kubeconfig, girca.storageListers, girca.featureGateAccessor)
90+
driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, girca.kubeconfig, girca.storageListers)
9591
if err == storage.ErrStorageNotConfigured || storage.IsMultiStoragesError(err) {
9692
return nil, false, nil
9793
} else if err != nil {

0 commit comments

Comments
 (0)