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.

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

{AKS} Integrate azuredisk csi driver version to cli #4865

Merged
merged 22 commits into from
May 30, 2022
Merged

{AKS} Integrate azuredisk csi driver version to cli #4865

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e48fa39
Initial changes for adding azuredis-csi-version and related test case…
mukhoakash May 20, 2022
b27a42c
Review comment resolved
mukhoakash May 20, 2022
9dfedd6
Some more changes to the logic and test cases
mukhoakash May 20, 2022
8519d83
Fixes in the test cases
mukhoakash May 21, 2022
60b332a
Renaming azuredisk_csi_version to disk_driver_version
mukhoakash May 23, 2022
29d6e18
Not setting default value of disk_driver_version
mukhoakash May 25, 2022
72d4430
Fixes to the test cases
mukhoakash May 25, 2022
9b47e3e
Added new aks command test
mukhoakash May 25, 2022
25f1068
Merge branch 'main' of github.com:Azure/azure-cli-extensions into muk…
mukhoakash May 25, 2022
3fa67ef
Some test case fix
mukhoakash May 25, 2022
062179b
Added a new version in setup and updated the history
mukhoakash May 25, 2022
782f1f5
Fixing a typo test failure
mukhoakash May 25, 2022
badb55f
Some fixes to the test aks command
mukhoakash May 25, 2022
fc3f8ff
Fixing a testcase
mukhoakash May 26, 2022
236b566
Adding the test cases fixes
mukhoakash May 26, 2022
0d05116
Bypassing one test case for now before its fixed in the AKS RP
mukhoakash May 26, 2022
2ec5b39
Fixed a typo
mukhoakash May 26, 2022
706be46
Removing one failing test case which depends on fixes in the AKS RP
mukhoakash May 26, 2022
8087425
Referencing consts for default driver version
mukhoakash May 27, 2022
9e71847
Preseving default location for test case to run on eastus2euap
mukhoakash May 30, 2022
2080625
Merge branch 'main' into mukhoakash/driverversion
mukhoakash May 30, 2022
6838779
updated version in setup.py
mukhoakash May 30, 2022
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
Prev Previous commit
Next Next commit
Not setting default value of disk_driver_version
  • Loading branch information
@mukhoakash
mukhoakash committed May 25, 2022
commit 29d6e18f88d0d2dcfbdf55c043f109de040cb6d1
9 changes: 4 additions & 5 deletions src/aks-preview/azext_aks_preview/decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,10 +1701,6 @@ def get_disk_driver(self) -> Optional[ManagedClusterStorageProfileDiskCSIDriver]
"The parameter --disable-disk-driver cannot be used "
"when --disk-driver-version is specified.")

# Setting default driver as v1 if not mentioned
if not disk_driver_version:
disk_driver_version = "v1"

if not (disk_driver_version == "v1" or disk_driver_version == "v2"):
raise InvalidArgumentValueError(
"Valid values for --disk-driver-version are v1 and v2")
Expand All @@ -1714,12 +1710,15 @@ def get_disk_driver(self) -> Optional[ManagedClusterStorageProfileDiskCSIDriver]
profile.enabled = False
else:
profile.enabled = True
if not disk_driver_version:
disk_driver_version = "v1"
mukhoakash marked this conversation as resolved.
Show resolved Hide resolved
profile.version = disk_driver_version

if self.decorator_mode == DecoratorMode.UPDATE:
if enable_disk_driver:
profile.enabled = True
profile.version = disk_driver_version
if disk_driver_version:
profile.version = disk_driver_version
elif disable_disk_driver:
profile.enabled = False

Expand Down