feat(controller-runtime): Add consumer controller #212
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
Checks for the PreventUpdate or readonly mode during creation/update. Skips reconciliation when resource is in namespace not matching restriction.
Set streamName and consumerName fields once. Reword log messages.
|
Hey. |
Comment on lines
25
to
+26
| "k8s.io/apimachinery/pkg/api/errors" | ||
| k8serrors "k8s.io/apimachinery/pkg/api/errors" |
Comment on lines
+320
to
+321
| c, err := jsClient.Consumer(ctx, streamName, consumerName) | ||
| Expect(c.CachedInfo().Config.Description).To(BeEmpty()) |
There was a problem hiding this comment.
Suggested change
| c, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| Expect(c.CachedInfo().Config.Description).To(BeEmpty()) | |
| c, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| Expect(err).NotTo(HaveOccurred()) | |
| Expect(c.CachedInfo().Config.Description).To(BeEmpty()) |
Comment on lines
+394
to
+395
| s, err := jsClient.Consumer(ctx, streamName, consumerName) | ||
| Expect(s.CachedInfo().Config.Description).To(BeEmpty()) |
There was a problem hiding this comment.
Suggested change
| s, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| Expect(s.CachedInfo().Config.Description).To(BeEmpty()) | |
| s, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| Expect(err).NotTo(HaveOccurred()) | |
| Expect(s.CachedInfo().Config.Description).To(BeEmpty()) |
| func (r *ConsumerReconciler) createOrUpdate(ctx context.Context, log klog.Logger, consumer *api.Consumer) error { | ||
|
|
||
| // Create or Update the stream based on the spec | ||
| if consumer.Spec.PreventUpdate || r.ReadOnly() { |
There was a problem hiding this comment.
I believe that we still want to permit a create if PreventUpdate is true, and only block update operations. It looks like I missed this in the stream controller as well
| // Create or Update the stream based on the spec | ||
| if consumer.Spec.PreventUpdate || r.ReadOnly() { | ||
| log.Info("Skipping consumer creation or update.", | ||
| "preventDelete", consumer.Spec.PreventDelete, |
There was a problem hiding this comment.
Was this intended to log the preventUpdate setting in the spec rather than preventDelete?
| Expect(result.IsZero()).To(BeTrue()) | ||
|
|
||
| By("checking that consumer was not updated") | ||
| s, err := jsClient.Consumer(ctx, streamName, consumerName) |
There was a problem hiding this comment.
Suggested change
| s, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| s, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| Expect(err).NotTo(HaveOccurred()) |
| Expect(k8sClient.Update(ctx, consumer)).To(Succeed()) | ||
|
|
||
| By("checking precondition, that the consumer does not yet exist") | ||
| got, err := jsClient.Consumer(ctx, streamName, consumerName) |
There was a problem hiding this comment.
Suggested change
| got, err := jsClient.Consumer(ctx, streamName, consumerName) | |
| _, err = jsClient.Consumer(ctx, streamName, consumerName) |
|
I have a branch based on this branch about ready for merge, so I just went ahead and addressed the few comments there. I will merge this and open a PR with those changes shortly |
samuelattwood
merged commit 88f61b2
into
nats-io:feature/controller-runtime
3 checks passed
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.
Adds reconciliation of consumer resources in the consumer controller
Implementation is analogous to the stream controller.