Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/allow replica of 1 for Jetstream #2822

Merged
merged 40 commits into from
Oct 5, 2023
Merged

Feat/allow replica of 1 for Jetstream #2822

merged 40 commits into from
Oct 5, 2023

Conversation

joelcomp1
Copy link
Contributor

Closes #2743

Tested using the following EventBus Config:

yaml spec: jetstream: imagePullSecrets: - name: private-registry replicas: 1 version: 2.9.19

Using Argo Events 1.8.1 with these changes. Then in my Argo Event helm chart I updated the stream config:

## Event bus configuration configs: ## JetStream event bus jetstream: streamConfig: # -- Number of replicas, defaults to 3 and requires minimal 3 replicas: 1

Need to fix issue with the nats.conf config map when replica of 3 is used

jmillage and others added 30 commits September 26, 2023 06:12
removed assumpetion of replica of 3 for jetstream, added warnings ins…
38c5fa2 
…tead

Signed-off-by: jmillage <[email protected]>
removed debug
4d467b0 
Signed-off-by: jmillage <[email protected]>
handle cluster case
c4e4e4d 
Signed-off-by: jmillage <[email protected]>
fix some tests
d208437 
Signed-off-by: jmillage <[email protected]>
fix some tests
8044382 
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/antonmedv/expr from 1.14.0 to 1.14.3 (ar…
ccca5b4 
…goproj#2774)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@github-actions
docs: updated CHANGELOG.md (argoproj#2779)
dde6192 
Signed-off-by: GitHub <[email protected]>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump sigstore/cosign-installer from 3.1.1 to 3.1.2 (argo…
e6bf99d 
…proj#2780)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/antonmedv/expr from 1.14.3 to 1.15.0 (ar…
2902f28 
…goproj#2781)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@kync
feat: add all sprig functions to templates (argoproj#2768)
5492f9a 
Signed-off-by: Ali Koyuncu <[email protected]>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/antonmedv/expr from 1.15.0 to 1.15.1 (ar…
350a797 
…goproj#2790)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump golang.org/x/crypto from 0.12.0 to 0.13.0 (argoproj…
8c5491a 
…#2789)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump google.golang.org/grpc from 1.57.0 to 1.58.0 (argop…
678793b 
…roj#2787)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/xanzy/go-gitlab from 0.90.0 to 0.91.1 (a…
3649fd7 
…rgoproj#2788)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump actions/checkout from 3 to 4 (argoproj#2792)
45ebdfa 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump google.golang.org/api from 0.136.0 to 0.139.0 (argo…
fcd53eb 
…proj#2791)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@risset
chore: Fix GitHubEventData Headers comment referring to GitLab (argop…
e3c5dc7 
…roj#2797)

Signed-off-by: Liam Wyllie <[email protected]>
Signed-off-by: jmillage <[email protected]>
@gokulav137
fix: Eventsource resourse label selector operators not working (argop…
b13421c 
…roj#2795)

Signed-off-by: gokulav137 <[email protected]>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump docker/setup-buildx-action from 2 to 3 (argoproj#2799)
eabe676 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/antonmedv/expr from 1.15.1 to 1.15.2 (ar…
0117b4b 
…goproj#2803)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump google.golang.org/api from 0.139.0 to 0.141.0 (argo…
114b985 
…proj#2801)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/nats-io/nats.go from 1.25.0 to 1.29.0 (a…
8a34a83 
…rgoproj#2806)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/Azure/azure-sdk-for-go/sdk/messaging/azs…
637fd00 
…ervicebus from 1.4.0 to 1.4.1 (argoproj#2808)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump go.uber.org/zap from 1.24.0 to 1.26.0 (argoproj#2809)
0784ab9 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump google.golang.org/grpc from 1.58.0 to 1.58.1 (argop…
701dc12 
…roj#2807)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/go-git/go-git/v5 from 5.7.0 to 5.9.0 (ar…
1aa7ac1 
…goproj#2804)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@gokulav137
feat(sensor): email trigger (argoproj#2793)
cc002f2 
Signed-off-by: gokulav137 <[email protected]>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/tidwall/gjson from 1.16.0 to 1.17.0 (arg…
3819049 
…oproj#2815)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/go-resty/resty/v2 from 2.7.0 to 2.8.0 (a…
a479073 
…rgoproj#2816)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/ktrysmt/go-bitbucket from 0.9.66 to 0.9.…
89c90a4 
…68 (argoproj#2817)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
dependabot bot and others added 5 commits September 26, 2023 06:12
@dependabot
chore(deps): bump google.golang.org/grpc from 1.58.1 to 1.58.2 (argop…
6785e4f 
…roj#2818)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump github.com/nats-io/nats.go from 1.29.0 to 1.30.0 (a…
a79e65b 
…rgoproj#2819)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dependabot
chore(deps): bump google.golang.org/api from 0.141.0 to 0.142.0 (argo…
c0fa127 
…proj#2821)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: jmillage <[email protected]>
@dnwe
chore(deps): bump sarama to v1.41.2 (argoproj#2823)
e3e28c2 
Signed-off-by: Dominic Evans <[email protected]>
Signed-off-by: jmillage <[email protected]>
@popsu
fix: eventsource: deterministic volume/volumeMount order (argoproj#2811)
1111e21 
Signed-off-by: Tommi Hovi <[email protected]>
Signed-off-by: jmillage <[email protected]>
@joelcomp1 joelcomp1 force-pushed the feat/allow-replica-of-1 branch from b8a4334 to 1111e21 Compare September 26, 2023 10:13
@joelcomp1 joelcomp1 marked this pull request as ready for review September 26, 2023 10:13
whynowy
whynowy reviewed Sep 27, 2023
View reviewed changes
controllers/eventbus/validate.go
@@ -32,9 +32,6 @@ func ValidateEventBus(eb *v1alpha1.EventBus) error {
if x.Version == "" {
return fmt.Errorf("invalid spec: a version for jetstream needs to be specified")
}
if x.Replicas != nil && *x.Replicas < 3 {
Copy link
Member

Choose a reason for hiding this comment

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

To disallow replicas==2 or replicas<=0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes good point, I'll add that check now

controllers/eventbus/installer/nats.go Outdated
@@ -436,7 +436,7 @@ func (i *natsInstaller) buildConfigMap() (*corev1.ConfigMap, error) {
ssName := generateStatefulSetName(i.eventBus)
replicas := i.eventBus.Spec.NATS.Native.GetReplicas()
if replicas < 3 {
replicas = 3
i.logger.Errorw("streaming recommends a replica size >= 3, '%v'", replicas)
Copy link
Member

Choose a reason for hiding this comment

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

Shall we keep the legacy nats streaming untouched, since it's already EOL?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I hadn't even thought about that, do you have a preference? Not sure how much NATS streaming is still used

Copy link
Member

Choose a reason for hiding this comment

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

This is the file for nats streaming installation, I would recommend to keep it untouched.

whynowy
whynowy reviewed Oct 3, 2023
View reviewed changes
controllers/eventbus/installer/nats.go Outdated
@@ -436,7 +436,7 @@ func (i *natsInstaller) buildConfigMap() (*corev1.ConfigMap, error) {
ssName := generateStatefulSetName(i.eventBus)
replicas := i.eventBus.Spec.NATS.Native.GetReplicas()
if replicas < 3 {
replicas = 3
i.logger.Errorw("streaming recommends a replica size >= 3, '%v'", replicas)
Copy link
Member

Choose a reason for hiding this comment

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

This is the file for nats streaming installation, I would recommend to keep it untouched.

controllers/eventbus/installer/nats.go Outdated
replicas := i.eventBus.Spec.NATS.Native.Replicas
if replicas < 3 {
replicas = 3
i.logger.Errorw("streaming recommends a replica >= 3, '%v'", replicas)
Copy link
Member

Choose a reason for hiding this comment

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

Use Warnw, and make the log message a complete sentence.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I reverted this back instead of fixing it since it was in the same file as above with the STAN implementation

@whynowy
Copy link
Member

whynowy commented Oct 3, 2023

Sorry for the late response!

@joelcomp1
Copy link
Contributor Author

reverted back the nats.go file to leave STAN untouched.

whynowy
whynowy approved these changes Oct 5, 2023
View reviewed changes
Copy link
Member

@whynowy whynowy left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@whynowy whynowy merged commit 4f01b34 into argoproj:master Oct 5, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@whynowy whynowy whynowy approved these changes

@VaibhavPage VaibhavPage Awaiting requested review from VaibhavPage

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Allow Jetstream have a replica of 1
7 participants
@joelcomp1 @whynowy @kync @risset @gokulav137 @dnwe @popsu