issue-559, Cadence controller integration of the rate limiter #597
Conversation
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
worryg0d
added
enhancement
worryg0d
requested review from
ribaraka,
testisnullus,
tengu-alt and
OleksiienkoMykyta
worryg0d
force-pushed
the
issue-559-cadence-rate-limiter-integration
branch
5 times, most recently
from
403f7cc to
2574fce
Compare
tengu-alt
approved these changes
Oct 17, 2023
ribaraka
requested changes
Oct 17, 2023
| } | ||
| } | ||
|
|
||
| func (r *CadenceReconciler) HandleCreateCluster( | ||
| ctx context.Context, | ||
| cadence *v1beta1.Cadence, | ||
| logger logr.Logger, | ||
| ) reconcile.Result { | ||
| ) (ctrl.Result, error) { |
There was a problem hiding this comment.
why have you changed a package from reconcile to ctrl?
There was a problem hiding this comment.
When we generate a controller with kubebuilder it creates default reconcile with ctrl.Result as returning value.
ctlr.Result is an alias for reconcile.Result. So, I decided to use the alias to avoid additional imports
Comment on lines
62
to
106
| ginkgo.When("deleting cadence resource", func() { | ||
| ginkgo.It("should successfully delete cadence resource in k8s and Instaclustr", func() { | ||
| cadenceManifest := *cadenceManifest | ||
| cadenceManifest.ResourceVersion = "" | ||
| cadenceManifest.Name += "-deleting" | ||
| cadenceManifest.Spec.Name += "-deleting" | ||
|
|
||
| gomega.Expect(k8sClient.Create(ctx, &cadenceManifest)).Should(gomega.Succeed()) | ||
|
|
||
| key := client.ObjectKeyFromObject(&cadenceManifest) | ||
| cadence := &v1beta1.Cadence{} | ||
|
|
||
| gomega.Eventually(func(g gomega.Gomega) { | ||
| g.Expect(k8sClient.Get(ctx, key, cadence)).Should(gomega.Succeed(), "should get the cadence resource") | ||
| g.Expect(cadence.Status.ID).ShouldNot(gomega.BeEmpty(), "the cadence id should not be empty") | ||
| }, timeout, interval).Should(gomega.Succeed()) | ||
|
|
||
| gomega.Expect(k8sClient.Delete(ctx, cadence)).Should(gomega.Succeed()) | ||
|
|
||
| gomega.Eventually(func(g gomega.Gomega) { | ||
| c := &v1beta1.Cadence{} | ||
| g.Expect(k8sClient.Get(ctx, key, c)).ShouldNot(gomega.Succeed()) | ||
| }, timeout, interval).Should(gomega.Succeed()) | ||
|
|
||
| gomega.Eventually(func() error { | ||
| _, err := instaClient.GetCadence(cadence.Status.ID) | ||
| return err | ||
| }, timeout, interval).Should(gomega.Equal(instaclustr.NotFound)) | ||
| }) | ||
| }) |
There was a problem hiding this comment.
You may delete the existing cluster that you created above in the ginkgo.When("apply valid cadence manifest", func() { case, instead of creating another cluster
There was a problem hiding this comment.
It makes sense, fixed
Comment on lines
94
to
122
| ginkgo.It("should create cadence and all packaged resources in k8s and on Instaclustr", func() { | ||
| cadenceManifest := *cadenceManifest | ||
| cadenceManifest.ResourceVersion = "" | ||
| cadenceManifest.Spec.StandardProvisioning = nil | ||
| cadenceManifest.Spec.Name += "-packaged-provisioning" | ||
| cadenceManifest.Name += "-packaged-provisioning" | ||
| cadenceManifest.Spec.PackagedProvisioning = []*v1beta1.PackagedProvisioning{ | ||
| { | ||
| UseAdvancedVisibility: true, | ||
| BundledKafkaSpec: &v1beta1.BundledKafkaSpec{ | ||
| NodeSize: "test-kafka-node-size-1", | ||
| NodesNumber: 2, | ||
| Network: "10.0.0.0/16", | ||
| ReplicationFactor: 2, | ||
| PartitionsNumber: 2, | ||
| }, | ||
| BundledOpenSearchSpec: &v1beta1.BundledOpenSearchSpec{ | ||
| NodeSize: "test-opensearch-node-size-1", | ||
| ReplicationFactor: 2, | ||
| Network: "10.1.0.0/16", | ||
| }, | ||
| BundledCassandraSpec: &v1beta1.BundledCassandraSpec{ | ||
| NodeSize: "test-cassandra-node-size-1", | ||
| NodesNumber: 2, | ||
| ReplicationFactor: 2, | ||
| Network: "10.2.0.0/16", | ||
| }, | ||
| }, | ||
| } |
There was a problem hiding this comment.
I suggest you create a new data_test file for the packaged provisioning resources
There was a problem hiding this comment.
Added new data file for packaged provisioning
Comment on lines
162
to
160
| ginkgo.When("deleting cadence resource with packaged provisioning", func() { | ||
| ginkgo.It("should successfully delete cadence and bundled resources in k8s and Instaclustr", func() { | ||
| cadenceManifest := *cadenceManifest | ||
| cadenceManifest.ResourceVersion = "" | ||
| cadenceManifest.Spec.StandardProvisioning = nil | ||
| cadenceManifest.Spec.Name += "-packaged-provisioning-deleting" | ||
| cadenceManifest.Name += "-packaged-provisioning-deleting" | ||
| cadenceManifest.Spec.PackagedProvisioning = []*v1beta1.PackagedProvisioning{ | ||
| { | ||
| UseAdvancedVisibility: true, | ||
| BundledKafkaSpec: &v1beta1.BundledKafkaSpec{ | ||
| NodeSize: "test-kafka-node-size-1", | ||
| NodesNumber: 2, | ||
| Network: "10.0.0.0/16", | ||
| ReplicationFactor: 2, | ||
| PartitionsNumber: 2, | ||
| }, | ||
| BundledOpenSearchSpec: &v1beta1.BundledOpenSearchSpec{ | ||
| NodeSize: "test-opensearch-node-size-1", | ||
| ReplicationFactor: 2, | ||
| Network: "10.1.0.0/16", | ||
| }, | ||
| BundledCassandraSpec: &v1beta1.BundledCassandraSpec{ | ||
| NodeSize: "test-cassandra-node-size-1", | ||
| NodesNumber: 2, | ||
| ReplicationFactor: 2, | ||
| Network: "10.2.0.0/16", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| gomega.Expect(k8sClient.Create(ctx, &cadenceManifest)).Should(gomega.Succeed()) | ||
|
|
||
| key := client.ObjectKeyFromObject(&cadenceManifest) | ||
| cadence := &v1beta1.Cadence{} | ||
|
|
||
| gomega.Eventually(func(g gomega.Gomega) { | ||
| g.Expect(k8sClient.Get(ctx, key, cadence)).Should(gomega.Succeed(), "should get the cadence resource") | ||
| g.Expect(cadence.Status.ID).ShouldNot(gomega.BeEmpty(), "the cadence id should not be empty") | ||
| }, timeout, interval).Should(gomega.Succeed()) | ||
|
|
There was a problem hiding this comment.
this all may also be removed. Just delete the existing one, that you created above
OleksiienkoMykyta
approved these changes
Oct 18, 2023
worryg0d
force-pushed
the
issue-559-cadence-rate-limiter-integration
branch
from
2574fce to
e04924f
Compare
worryg0d
force-pushed
the
issue-559-cadence-rate-limiter-integration
branch
from
e04924f to
f283c60
Compare
ribaraka
approved these changes
Oct 18, 2023
worryg0d
force-pushed
the
issue-559-cadence-rate-limiter-integration
branch
from
f283c60 to
07cc9ff
Compare
worryg0d
force-pushed
the
issue-559-cadence-rate-limiter-integration
branch
from
07cc9ff to
855af61
Compare
testisnullus
approved these changes
Oct 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Our custom rate limiter, which allows rate-limiting the amount of reconciliation for resources, was integrated into the cadence controller.
Also, the cadence controller was covered with integration tests.