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(#3657): Use OPERATOR_ID EnvVar consistently #3660

Merged
merged 1 commit into from
Sep 27, 2022

Conversation

christophd
Copy link
Contributor

@christophd christophd commented Sep 20, 2022

The code base was using exclusively KAMEL_OPERATOR_ID as environment setting to identify the operator id. This caused problems after OLM based installation because KAMEL_OPERATOR_ID is not being used in this kind of installation. Simplify things by using also using OPERATOR_ID when obtaining an operator id from EnvVar settings. Still support KAMEL_OPERATOR_ID when installing via kamel install in order to overwrite the default id given in the CRDs.

Fixes #3657

Release Note

Fix: Also use OPERATOR_ID EnvVar to obtain the operator id

@squakez
Copy link
Contributor

squakez commented Sep 26, 2022

This test is repeatedly complaining with:

    --- FAIL: TestNativeIntegrations/automatic_rollout_deployment_from_fast-jar_to_native_kit (1844.79s)

@tadayosi
Copy link
Member

@christophd Maybe you should rebase it with main and force push again.

The code base was using exclusively `KAMEL_OPERATOR_ID` as environment setting to identify the operator id. This caused problems after OLM based installation because `KAMEL_OPERATOR_ID` is not being used in this kind of installation. Simplify things by using also using `OPERATOR_ID` when obtaining an operator id from EnvVar settings. Still support `KAMEL_OPERATOR_ID` when installing via `kamel install` in order to overwrite the default id given in the CRDs.
@christophd
Copy link
Contributor Author

@tadayosi thanks. Let's see how it goes ...

@christophd
Copy link
Contributor Author

wow, all green!

@oscerd
Copy link
Contributor

oscerd commented Sep 27, 2022

This could be merged.

@oscerd oscerd added this to the 1.11.0 milestone Sep 27, 2022
@oscerd
Copy link
Contributor

oscerd commented Sep 27, 2022

Do we need to backport to 1.10.x too?

@oscerd oscerd merged commit 62780a8 into apache:main Sep 27, 2022
@christophd
Copy link
Contributor Author

@oscerd thanks for merging! and yes, this is for 1.10.x, too

@oscerd
Copy link
Contributor

oscerd commented Sep 27, 2022

Can you please create a backport pr?

@christophd
Copy link
Contributor Author

sure #3680

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.

OLM installtion needs to set KAMEL_OPERATOR_ID EnvVar
4 participants