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

Jump to bottom

[AKS] Prompt when disabling CSI Drivers #4868

Merged

zhoxing-ms merged 1 commit into Azure:main from ZeroMagic:jiliu8/disable-alert

Jun 2, 2022

Contributor

ZeroMagic commented May 22, 2022

This checklist is used to make sure that common guidelines for a pull request are followed.

Related command

General Guidelines

Have you run azdev style <YOUR_EXT> locally? (pip install azdev required)
Have you run python scripts/ci/test_index.py -q locally?

For new extensions:

My extension description/summary conforms to the Extension Summary Guidelines.

About Extension Publish

There is a pipeline to automatically build, upload and publish extension wheels.
Once your pull request is merged into main branch, a new pull request will be created to update src/index.json automatically.
The precondition is to put your code inside this repository and upgrade the version in the pull request but do not modify src/index.json.

ZeroMagic requested review from andyliuliming and FumingZhang as code owners

May 22, 2022 17:39

ghost requested review from zhoxing-ms and wangzelin007

May 22, 2022 17:39

ghost assigned zhoxing-ms

ghost added this to the Jun 2022 (2022-07-05) milestone

ghost added the Auto-Assign label

ghost requested a review from yonzhan

May 22, 2022 17:39

ghost added the AKS label

Collaborator

yonzhan commented May 22, 2022

AKS

Member

wangzelin007 commented May 26, 2022

Please address those conflicts and the 7 failing checks.

ZeroMagic force-pushed the jiliu8/disable-alert branch from 939ca17 to 911752e Compare

May 30, 2022 15:46

andyzhangx reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/custom.py Outdated

    
            @@ -907,6 +916,16 @@ def aks_update(cmd,     # pylint: disable=too-many-statements,too-many-branches,
          
                             enable_apiserver_vnet_integration=False,

                             apiserver_subnet_id=None,

                             ):

                  if disable_disk_driver or disable_file_driver:

                      msg = 'Did you check if the related PVs and PVCs were deleted before disabling the CSI Drivers?'

Contributor

andyzhangx May 31, 2022 •

edited

Loading

please make sure there are no existing Kubernetes resources that are used by the CSI driver before disabling

Contributor

andyzhangx May 31, 2022

@olsenme are you ok with the above statement in the cli command?

Contributor Author

ZeroMagic May 31, 2022

Changed.

src/aks-preview/azext_aks_preview/custom.py Outdated

    
                      if not yes and not prompt_y_n(msg, default="n"):

                          return None

                  if disable_snapshot_controller:

                      msg = 'Did you check if VolumeSnapshots, VolumeSnapshotClasses and VolumeSnapshotContents CRDs and their resources were deleted before disabling SnapshotController?'

Contributor

andyzhangx May 31, 2022 •

edited

Loading

please make sure there are no existing Kubernetes resources that are used by the snapshot controller before disabling

Contributor

andyzhangx May 31, 2022

@olsenme are you ok with the above statement in the cli command?

Contributor Author

ZeroMagic May 31, 2022

Changed.

andyzhangx reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/custom.py Show resolved Hide resolved

andyzhangx reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/custom.py Show resolved Hide resolved

ZeroMagic force-pushed the jiliu8/disable-alert branch 2 times, most recently from ce74139 to 0bccf1f Compare

May 31, 2022 02:10

andyzhangx reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/custom.py Outdated Show resolved Hide resolved

ZeroMagic force-pushed the jiliu8/disable-alert branch 2 times, most recently from 93ce389 to 1676ce1 Compare

May 31, 2022 07:21

andyzhangx approved these changes

View reviewed changes

FumingZhang requested changes

View reviewed changes

src/aks-preview/azext_aks_preview/custom.py Outdated

Comment on lines 818 to 827

    
                  if disable_disk_driver or disable_file_driver:

                      msg = "Please make sure there are no existing PVs and PVCs that are used by the CSI driver before disabling."

                      if not yes and not prompt_y_n(msg, default="n"):

                          return None

                  if disable_snapshot_controller:

                      msg = "Please make sure there are no existing VolumeSnapshots, VolumeSnapshotClasses and VolumeSnapshotContents " \

                            "that are used by the snapshot controller before disabling."

                      if not yes and not prompt_y_n(msg, default="n"):

                          return None

Member

FumingZhang May 31, 2022

Please put these statements below raw_parameters = locals(). Also put them into decorator.py? It's hard to test the entry function (aks_create).

Contributor Author

ZeroMagic May 31, 2022

done

src/aks-preview/azext_aks_preview/custom.py Outdated

Comment on lines 921 to 929

    
                  if disable_disk_driver or disable_file_driver:

                      msg = "Please make sure there are no existing PVs and PVCs that are used by the CSI driver before disabling."

                      if not yes and not prompt_y_n(msg, default="n"):

                          return None

                  if disable_snapshot_controller:

                      msg = "Please make sure there are no existing VolumeSnapshots, VolumeSnapshotClasses and VolumeSnapshotContents " \

                            "that are used by the snapshot controller before disabling."

                      if not yes and not prompt_y_n(msg, default="n"):

                          return None

Member

FumingZhang May 31, 2022

Similar to above.

Contributor Author

ZeroMagic May 31, 2022

done

ZeroMagic force-pushed the jiliu8/disable-alert branch from 1676ce1 to d534ce0 Compare

May 31, 2022 10:41

andyzhangx reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/decorator.py Outdated

    
                      :return: Optional[ManagedClusterStorageProfileDiskCSIDriver]

                      """

                      enable_disk_driver = self.raw_param.get("enable_disk_driver")

                      disable_disk_driver = self.raw_param.get("disable_disk_driver")

                      disk_driver_version = self.raw_param.get("disk_driver_version")

                      if disable_disk_driver:

                          msg = "Please make sure there are no existing PVs and PVCs that are used by AzureDisk CSI driver before disabling."

Contributor

andyzhangx May 31, 2022

the prompt may happen in az aks create command? it should only prompt in az aks update

Contributor Author

ZeroMagic May 31, 2022

Make sense. Let me add it into self.decorator_mode == DecoratorMode.UPDATE

ZeroMagic force-pushed the jiliu8/disable-alert branch from d534ce0 to de7b30b Compare

May 31, 2022 13:05

andyzhangx approved these changes

View reviewed changes

ZeroMagic force-pushed the jiliu8/disable-alert branch 3 times, most recently from cf76919 to 20ff17e Compare

May 31, 2022 13:50


          Prompt when disabling CSI Drivers

4a5fb99

Signed-off-by: Ji An Liu <[email protected]>

ZeroMagic force-pushed the jiliu8/disable-alert branch from 20ff17e to 4a5fb99 Compare

May 31, 2022 14:21

FumingZhang approved these changes

View reviewed changes

Member

FumingZhang left a comment

LGTM

zhoxing-ms reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/decorator.py

Comment on lines +1763 to +1765

+                              msg = "Please make sure there are no existing PVs and PVCs that are used by AzureDisk CSI driver before disabling."
+                              if not self.get_yes() and not prompt_y_n(msg, default="n"):
+                                  raise DecoratorEarlyExitException()

Contributor

zhoxing-ms Jun 1, 2022 •

edited

Loading

May I ask will the execution of CLI scripts in the automation scenario be blocked by such interactive steps that require input?

Contributor Author

ZeroMagic Jun 1, 2022 •

edited

Loading

yes. but -y can be added into scripts like what we do in test_aks_command.py

zhoxing-ms reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/decorator.py

Comment on lines +1798 to +1800

+                              msg = "Please make sure there are no existing PVs and PVCs that are used by AzureFile CSI driver before disabling."
+                              if not self.get_yes() and not prompt_y_n(msg, default="n"):
+                                  raise DecoratorEarlyExitException()

Contributor

zhoxing-ms Jun 1, 2022

Same as above

zhoxing-ms reviewed

View reviewed changes

src/aks-preview/azext_aks_preview/decorator.py

Comment on lines +1834 to +1837

+                              msg = "Please make sure there are no existing VolumeSnapshots, VolumeSnapshotClasses and VolumeSnapshotContents " \
+                                    "that are used by the snapshot controller before disabling."
+                              if not self.get_yes() and not prompt_y_n(msg, default="n"):
+                                  raise DecoratorEarlyExitException()

Contributor

zhoxing-ms Jun 1, 2022

Same as above

zhoxing-ms approved these changes

View reviewed changes

zhoxing-ms merged commit d47de83 into Azure:main

ZeroMagic deleted the jiliu8/disable-alert branch

June 2, 2022 03:06

wangzelin007 mentioned this pull request

Fix conflicts for aks_preview index.json #4940

Merged

3 tasks

FumingZhang added a commit to FumingZhang/azure-cli-extensions that referenced this pull request


          sync csi changes PR Azure#4865 & PR Azure#4868

f0bb79a

FumingZhang mentioned this pull request

{AKS} Update v2 managed cluster decorator - part 2 #4982

Merged

3 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

FumingZhang FumingZhang approved these changes

zhoxing-ms zhoxing-ms approved these changes

andyzhangx andyzhangx approved these changes

andyliuliming Awaiting requested review from andyliuliming andyliuliming is a code owner

wangzelin007 Awaiting requested review from wangzelin007

yonzhan Awaiting requested review from yonzhan

Labels

AKS Auto-Assign