-
Notifications
You must be signed in to change notification settings - Fork 9
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
feat: MQ v1beta1 support, renaming of Ops MQ #62
Conversation
Support bundle support for aio-mq-operator deployment MQ namespace updates Test fixes
MQ_API_V1A2 = EdgeResourceApi(group="mq.iotoperations.azure.com", version="v1alpha2", moniker="mq") | ||
MQ_API_V1A3 = EdgeResourceApi(group="mq.iotoperations.azure.com", version="v1alpha3", moniker="mq") | ||
MQ_API_V1A4 = EdgeResourceApi(group="mq.iotoperations.azure.com", version="v1alpha4", moniker="mq") | ||
MQ_API_V1B1 = EdgeResourceApi(group="mq.iotoperations.azure.com", version="v1beta1", moniker="mq") | ||
|
||
E4K_ACTIVE_API = E4K_API_V1A4 | ||
MQ_ACTIVE_API = MQ_API_V1B1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a note for discussion - are we leaving any of the previous alpha
APIs?
Maybe just v1alpha4
and v1beta1
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should start with only the latest for public preview, which Az IoT Ops CLI is intended for.
I don't see any benefit for supporting private preview versions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Private preview customers can use the edge CLI if they need to, but that will quickly disappear.
@@ -1069,8 +1071,8 @@ def display_topic_maps( | |||
), | |||
) | |||
if detail_level == ResourceOutputDetailLevel.verbose.value: | |||
delta_table = topic_mapping.get("deltaTable", {}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah these little changes
@@ -22,19 +24,19 @@ | |||
|
|||
logger = get_logger(__name__) | |||
|
|||
E4K_APP_LABELS = [ | |||
'azedge-e4k-operator', | |||
MQ_APP_LABELS = [ | |||
'broker', | |||
'diagnostics', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are diagnostics, broker and health-manager labels still needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The aio-mq-diagnostics-service
, aio-mq-dmqtt-frontend/aio-mq-dmqtt-backend
, and aio-mq-dmqtt-health-manager
resources are using app=diagnostics
, app=broker
, and app=health-manager
respectively.
app=diagnostics
is used byaio-mq-diagnostics-service
app=broker
is used byaio-mq-dmqtt-frontend
aio-mq-dmqtt-backend
aio-mq-dmqtt-authentication
app=health-manager
is used byaio-mq-dmqtt-health-manager
I'll raise a followup PR to update, but we actually just need to remove aio-mq-diagnostics-service
from this list, since it uses app=diagnostics
instead.
@@ -11,27 +11,22 @@ | |||
CheckTaskStatus, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The file name still has e4k in it
# Assert runtime resources | ||
assert_list_deployments(mocked_client, mocked_zipfile, label_selector=E4K_LABEL, resource_api=E4K_API_V1A2) | ||
assert_list_deployments(mocked_client, mocked_zipfile, label_selector=MQ_LABEL, | ||
resource_api=MQ_API_V1B1, field_selector=f"metadata.name={AIO_MQ_OPERATOR}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
This PR adds support for:
mq
namespace / module refactoringThis also updates a few cloud connector properties that have changed between
v1alpha4
andv1beta1
This project has adopted the Microsoft Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.
Thank you for contributing to Azure IoT Operations tooling!
This checklist is used to make sure that common guidelines for a pull request are followed.
General Guidelines
Intent for Production
dev
ormain
are of production grade. Corollary to this, any merged contributions to these branches may be deployed in a public release at any given time. By checking this box, you agree and commit to the expected production quality of code.Basic expectations
pytest <project root> -vv
. Please provide evidence in the form of a screenshot showing a succesful run of tests locally OR a link to a test pipeline that has been run against the change-set..pylintrc
and.flake8
rules? Look at the CI scripts for example usage.Azure IoT Operations CLI maintainers reserve the right to enforce any of the outlined expectations.
A PR is considered ready for review when all basic expectations have been met (or do not apply).