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.

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

operator: allow to configure the lock name #3163

Merged
merged 2 commits into from
Apr 20, 2022

Conversation

lburgazzoli
Copy link
Contributor

@lburgazzoli lburgazzoli commented Apr 3, 2022

Release Note

NONE

Fixes #3162

@lburgazzoli lburgazzoli changed the title operator: allow to configure the lock name #3162 operator: allow to configure the lock name Apr 3, 2022
@lburgazzoli lburgazzoli marked this pull request as draft April 3, 2022 09:56
@lburgazzoli
Copy link
Contributor Author

Not sure if this is the right way to do it or even if that's the right way to solve it.

pkg/cmd/operator.go Outdated Show resolved Hide resolved
}

func (o *operatorCmdOptions) run(_ *cobra.Command, _ []string) {
operator.Run(o.HealthPort, o.MonitoringPort, o.LeaderElection)
operator.Run(o.HealthPort, o.MonitoringPort, o.LeaderElection, o.LeaderElectionID)
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to check if that parameter exists, and, if not, fallback to platform.OperatorLockName (which I'd call at this stage as platform.OperatorDefaultLockName)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This should already happen when the flag is initialized, by default it should be that value

@lburgazzoli lburgazzoli marked this pull request as ready for review April 20, 2022 07:52
@lburgazzoli
Copy link
Contributor Author

@astefanutti @squakez do you think this can be merged or we should have some better way of dealing with it ?

@astefanutti
Copy link
Member

@lburgazzoli LGTM, +1 to have it merged.

@astefanutti
Copy link
Member

@lburgazzoli could you just make sure to regenerate the pkg/resources/resources.go file, it seems there are some changes that may not be needed.

@lburgazzoli
Copy link
Contributor Author

@lburgazzoli could you just make sure to regenerate the pkg/resources/resources.go file, it seems there are some changes that may not be needed.

remind me how to re-genreate it

@astefanutti
Copy link
Member

@lburgazzoli could you just make sure to regenerate the pkg/resources/resources.go file, it seems there are some changes that may not be needed.

remind me how to re-genreate it

That should be make build-resources.

@lburgazzoli
Copy link
Contributor Author

@lburgazzoli could you just make sure to regenerate the pkg/resources/resources.go file, it seems there are some changes that may not be needed.

remind me how to re-genreate it

That should be make build-resources.

Done, I had to change the staging maven repo to https://repository.apache.org/content/repositories/orgapachecamel-1427

@oscerd is that correct ?

@oscerd
Copy link
Contributor

oscerd commented Apr 20, 2022

Yes, there is another PR with that fix, but we could merge this one and we've done.

@astefanutti
Copy link
Member

Let's merge it so we can proceed with the release.

@astefanutti astefanutti merged commit 2b97601 into apache:main Apr 20, 2022
@lburgazzoli lburgazzoli deleted the gh-3162 branch April 20, 2022 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

operator: allow to configure the lock name
4 participants