Bug 1820255: Fix race for localhost-recovery-client-token snapshotting #815
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ import ( | |
| "github.com/openshift/library-go/pkg/controller/controllercmd" | ||
| "github.com/openshift/library-go/pkg/operator/certrotation" | ||
| "github.com/openshift/library-go/pkg/operator/encryption" | ||
| "github.com/openshift/library-go/pkg/operator/encryption/controllers" | ||
| "github.com/openshift/library-go/pkg/operator/encryption/controllers/migrators" | ||
| encryptiondeployer "github.com/openshift/library-go/pkg/operator/encryption/deployer" | ||
| "github.com/openshift/library-go/pkg/operator/genericoperatorclient" | ||
|
|
@@ -41,6 +42,18 @@ import ( | |
| "k8s.io/client-go/kubernetes" | ||
| ) | ||
|
|
||
| type encryptionProvider []schema.GroupResource | ||
|
|
||
| var _ controllers.Provider = encryptionProvider{} | ||
|
|
||
| func (p encryptionProvider) EncryptedGRs() []schema.GroupResource { | ||
|
There was a problem hiding this comment. @p0lyn0mial I missed this in library-go, but I think we should try to keep interfaces more verbose rather than cryptic, iow. this should've been |
||
| return p | ||
| } | ||
|
|
||
| func (p encryptionProvider) ShouldRunEncryptionControllers() (bool, error) { | ||
| return true, nil | ||
| } | ||
|
|
||
| func RunOperator(ctx context.Context, controllerContext *controllercmd.ControllerContext) error { | ||
| // This kube client use protobuf, do not use it for CR | ||
| kubeClient, err := kubernetes.NewForConfig(controllerContext.ProtoKubeConfig) | ||
|
|
@@ -178,8 +191,12 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle | |
| migrationInformer := migrationv1alpha1informer.NewSharedInformerFactory(migrationClient, time.Minute*30) | ||
| migrator := migrators.NewKubeStorageVersionMigrator(migrationClient, migrationInformer.Migration().V1alpha1(), kubeClient.Discovery()) | ||
|
|
||
| encryptionControllers := encryption.NewControllers( | ||
| operatorclient.TargetNamespace, | ||
| encryptionProvider{ | ||
| schema.GroupResource{Group: "", Resource: "secrets"}, | ||
| schema.GroupResource{Group: "", Resource: "configmaps"}, | ||
| }, | ||
| deployer, | ||
| migrator, | ||
| operatorClient, | ||
|
|
@@ -188,12 +205,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle | |
| kubeInformersForNamespaces, | ||
| kubeClient.CoreV1(), | ||
| controllerContext.EventRecorder, | ||
| ) | ||
|
|
||
| featureUpgradeableController := featureupgradablecontroller.NewFeatureUpgradeableController( | ||
| operatorClient, | ||
|
|
@@ -249,7 +261,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle | |
| go configObserver.Run(ctx, 1) | ||
| go clusterOperatorStatus.Run(ctx, 1) | ||
| go certRotationController.Run(ctx, 1) | ||
| go encryptionControllers.Run(ctx, 1) | ||
| go featureUpgradeableController.Run(ctx, 1) | ||
| go certRotationTimeUpgradeableController.Run(ctx, 1) | ||
| go terminationObserver.Run(ctx, 1) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@p0lyn0mial I suppose this could have been in library-go next to the interface as
SimpleProviderThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, thx :)