Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/azure-cli/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Release History
**ACR**

* Support zone redundancy (#15975)
* `az acr connected-registry`: New feature for on-prem Azure Container Registry (#16238)
* `az acr scope-map update`: --add and --remove are deprecated, they are renamed to --add-repo --remove-repo (#16238)
* `az acr scope-map create/update`: Add support to handle Gateway actions. (#16238)
* `az acr token create`: support added for gateway actions (#16238)
* `az acr connected-registry`: Added support for private preview of connected registry feature. (#16238)
Comment thread
rosanch marked this conversation as resolved.
Outdated
* `az acr scope-map update`: Deprecated the --add and --remove argument names, replaced with --add-repo and --remove-repo. (#16238)
* `az acr scope-map create/update`: Introduced gateway permissions to support private preview of connected registry feature. (#16238)
* `az acr token create`: Introduced synchronization tokens to support private preview of connected registry feature. (#16238)

**AKS**

Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/acr/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -1224,15 +1224,15 @@
- name: Create a connected registry in registry mode with access to repos app/hello-world and service/mycomponent. It'll create a sync token and scope-map with the right repo permissions.
text: |
az acr connected-registry create --registry mycloudregistry --name myconnectedregistry \\
--repository "app/hello-world service/mycomponent"
--repositories "app/hello-world service/mycomponent"
- name: Create a mirror connected registry with only read permissions and pass the sync token
text: |
az acr connected-registry create --registry mycloudregistry --name mymirroracr \\
--mode mirror --parent myconnectedregistry --sync-token mySyncTokenName
- name: Create a mirror connected registry with client tokens, that syncs every day at midninght and sync window of 4 hours.
text: |
az acr connected-registry create -r mycloudregistry -n mymirroracr -p myconnectedregistry \\
-t app/mycomponent -m mirror -s "0 12 * * *" -w PT4H \\
--repositories app/mycomponent -m mirror -s "0 12 * * *" -w PT4H \\
--client-tokens myTokenName1 myTokenName2
"""

Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/acr/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ def load_arguments(self, _): # pylint: disable=too-many-statements
c.argument('registry_name', options_list=['--registry', '-r'], help='The login server of the Cloud ACR registry. Must be the FQDN to support also Azure Stack.', required=True)
c.argument('connected_registry_name', options_list=['--name', '-n'], help='Name for the connected registry. Name must be between 5 to 40 character long, start with a letter and contain only alphanumeric characters (including ‘_’ or ‘-’). Name must be unique under the Cloud ACR hierarchy.', required=True)
c.argument('parent_name', options_list=['--parent', '-p'], help='The name of the parent connected registry.', required=False)
c.argument('repositories', options_list=['--repository', '-t'], nargs='+', help='Specifies the repositories that need to be sync to the connected registry. It can be in the format [REPO01] [REPO02]...', required=False)
c.argument('repositories', nargs='+', help='Specifies the repositories that need to be sync to the connected registry. It can be in the format [REPO01] [REPO02]...', required=False)
Comment thread
rosanch marked this conversation as resolved.
Outdated
c.argument('sync_token_name', options_list=['--sync-token'], help='Specifies the sync token used to synchronize the connected registry with its parent. It most have only repo permissions and at least the actions required for its mode. It can include access for multiple repositories.', required=False)
c.argument('cleanup', help='It will aslo delete the sync token and the scope map resources.', required=False)
c.argument('no_children', help='Used to remove all children from the list.', required=False, action='store_true')
Expand Down