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

fix(olm): IntegrationPlatform reconciled by operator #3172

Merged
merged 3 commits into from
Apr 13, 2022

Conversation

squakez
Copy link
Contributor

@squakez squakez commented Apr 5, 2022

Closes #3161

Release Note

fix(olm): IntegrationPlatform reconciled by operator 

@squakez
Copy link
Contributor Author

squakez commented Apr 5, 2022

fyi @astefanutti @lburgazzoli

Copy link
Member

@astefanutti astefanutti left a comment

Choose a reason for hiding this comment

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

The annotation should probably be transported also here:

defaultPlatform := v1.NewIntegrationPlatform(namespace, platformName)

@squakez
Copy link
Contributor Author

squakez commented Apr 6, 2022

The annotation should probably be transported also here:

defaultPlatform := v1.NewIntegrationPlatform(namespace, platformName)

I've tried to cascade the annotation there, but I noticed that we cannot reach that point because we always get the IntegrationPlatform present in the operator namespace (see

pl, err := platform.GetOrFindForResource(e.Ctx, t.Client, e.Integration, false)
)

@astefanutti
Copy link
Member

The annotation should probably be transported also here:

defaultPlatform := v1.NewIntegrationPlatform(namespace, platformName)

I've tried to cascade the annotation there, but I noticed that we cannot reach that point because we always get the IntegrationPlatform present in the operator namespace (see

pl, err := platform.GetOrFindForResource(e.Ctx, t.Client, e.Integration, false)

)

Even when the operator is installed with OLM?

@squakez
Copy link
Contributor Author

squakez commented Apr 6, 2022

Even when the operator is installed with OLM?

I haven't tested that scenario. Let me check how it is affected in such case.

@squakez squakez force-pushed the fix/3161_operator_id branch 2 times, most recently from 3338e27 to 7d5617e Compare April 11, 2022 13:53
e2e/common/cli/install_test.go Show resolved Hide resolved
@squakez
Copy link
Contributor Author

squakez commented Apr 12, 2022

I've tested locally to confirm OLM behavior is fine. We'll need to include an automated E2E test for OLM installation once #3180 is ready.

@squakez squakez merged commit 9d52976 into apache:main Apr 13, 2022
@squakez squakez deleted the fix/3161_operator_id branch April 13, 2022 09:25
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.

Error when running camel-k in global mode with label selection
4 participants