Skip to content

adding new version of python sdk #3

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.

Sign up for GitHub

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

Merged
JackQuincy merged 11 commits into from
Apr 10, 2019
Merged

adding new version of python sdk #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af32d52
adding cluster admin option to osa create
JackQuincy Mar 27, 2019
e144ccd
adding direcctory read permissions to the aad app
JackQuincy Apr 5, 2019
3f15e59
making app always require directory permissions
JackQuincy Apr 5, 2019
0314594
Merge branch 'osa-cluster-admin-dev' of https://github.com/JackQuincy…
JackQuincy Apr 5, 2019
d2dc8e6
Merge branch 'osa-cluster-admin-dev' of https://github.com/JackQuincy…
JackQuincy Apr 6, 2019
e4a2d63
clean + infra node to 3
julienstroheker Apr 8, 2019
99e7253
Merge pull request #2 from julienstroheker/osa-cluster-admin-dev
JackQuincy Apr 8, 2019
3e12e71
fixing typo
JackQuincy Apr 8, 2019
53a6816
Merge branch 'osa-cluster-admin-dev' of https://github.com/JackQuincy…
JackQuincy Apr 8, 2019
7a1aa81
using new version of acs python sdk
JackQuincy Apr 10, 2019
641e63c
Merge branch 'osa-cluster-admin-dev' of https://github.com/JackQuincy…
JackQuincy Apr 10, 2019
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
9 changes: 7 additions & 2 deletions src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2254,9 +2254,14 @@ def _ensure_osa_aad(cli_ctx,
# Delegate Sign In and Read User Profile permissions on Windows Azure Active Directory API
resource_access = ResourceAccess(id="311a71cc-e848-46a1-bdf8-97ff7156d8e6",
additional_properties=None, type="Scope")
required_osa_aad_access = RequiredResourceAccess(resource_access=[resource_access],
# Read directory permissions on Windows Azure Active Directory API
directory_access = ResourceAccess(id="5778995a-e1bf-45b8-affa-663a9f3f4d04",
additional_properties=None, type="Scope")

required_osa_aad_access = RequiredResourceAccess(resource_access=[resource_access, directory_access],
additional_properties=None,
resource_app_id="00000002-0000-0000-c000-000000000000")

list_aad_filtered = list(rbac_client.applications.list(filter="identifierUris/any(s:s eq '{}')"
.format(reply_url)))
if update:
Expand Down Expand Up @@ -2502,7 +2507,7 @@ def openshift_create(cmd, client, resource_group_name, name, # pylint: disable=

agent_infra_pool_profile = OpenShiftManagedClusterAgentPoolProfile(
name='infra', # Must be 12 chars or less before ACS RP adds to it
count=int(2),
count=int(3),
vm_size="Standard_D4s_v3",
os_type="Linux",
role=OpenShiftAgentPoolProfileRole.infra,
Expand Down
2 changes: 1 addition & 1 deletion src/command_modules/azure-cli-acs/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

DEPENDENCIES = [
'azure-mgmt-authorization==0.50.0',
'azure-mgmt-containerservice==4.4.0',
'azure-mgmt-containerservice==5.1.0',
'azure-mgmt-compute==4.4.0',
'azure-graphrbac==0.60.0',
'azure-cli-core',
Expand Down