-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Fixed issue when registry creds are provided for ACRs using containerapp up
command
#7198
Merged
wangzelin007
merged 22 commits into
Azure:main
from
harryli0108:harrli/cross-sub-registry-fail-fix
Feb 29, 2024
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
8efb0f9
Fixed issue when registry creds are provided for ACRs in capp up
harryli0108 7cad26a
Lint error fixed
harryli0108 4c3235d
Addressed comments and added test recordings
harryli0108 1dd747e
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 1d8b8e7
Retriggering pipeline
harryli0108 45ed9d9
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 b7dde54
Added missing tests
harryli0108 b062baf
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 cb94f12
Rerun live tests
harryli0108 cd9f035
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 cbada5e
Re-recorded tests
harryli0108 6071218
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 6162cf2
Updated test recording
harryli0108 e8743b4
Updated failed test
harryli0108 02dc57d
Revert unmodified test
harryli0108 0c8a7bb
Fixed pylint errors
harryli0108 6a35dd4
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 67717d0
Updated HISTORY
harryli0108 c37d9fd
Fixed indent
harryli0108 50bf63b
Merge branch 'main' into harrli/cross-sub-registry-fail-fix
harryli0108 51cbb88
Updated test recordings
harryli0108 0c4f9d6
merge main
Greedygre File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -190,7 +190,7 @@ def delete_weaviate_service(cmd, service_name, resource_group_name, no_wait=Fals | |
|
||
|
||
def create_milvus_service(cmd, service_name, environment_name, resource_group_name, no_wait=False, | ||
disable_warnings=True): | ||
disable_warnings=True): | ||
return DevServiceUtils.create_service(cmd, service_name, environment_name, resource_group_name, no_wait, | ||
disable_warnings, DEV_MILVUS_IMAGE, DEV_MILVUS_SERVICE_TYPE, | ||
DEV_MILVUS_CONTAINER_NAME) | ||
|
@@ -1191,7 +1191,9 @@ def containerapp_up(cmd, | |
env = ContainerAppEnvironment(cmd, environment, resource_group, location=location, logs_key=logs_key, logs_customer_id=logs_customer_id, custom_location_id=custom_location_id, connected_cluster_id=connected_cluster_id) | ||
app = ContainerApp(cmd, name, resource_group, None, image, env, target_port, registry_server, registry_user, registry_pass, env_vars, workload_profile_name, ingress) | ||
|
||
_set_up_defaults(cmd, name, resource_group_name, logs_customer_id, location, resource_group, env, app, custom_location, extension) | ||
# Check and see if registry username and passwords are specified. If so, set is_registry_server_params_set to True to use those creds. | ||
is_registry_server_params_set = bool(registry_server and registry_user and registry_pass) | ||
This comment was marked as off-topic.
Sorry, something went wrong. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry, I noticed the command |
||
_set_up_defaults(cmd, name, resource_group_name, logs_customer_id, location, resource_group, env, app, custom_location, extension, is_registry_server_params_set) | ||
|
||
if app.check_exists(): | ||
if app.get()["properties"]["provisioningState"] == "InProgress": | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as off-topic.
Sorry, something went wrong.
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.
Currently with
az containerapp up
it will failed with error:Failed to retrieve credentials for container registry. Please provide the registry username and password