From a201cda3da73c9543f5d03cfb3dc4c1595915897 Mon Sep 17 00:00:00 2001 From: parth-gr Date: Tue, 9 Jan 2024 20:14:26 +0530 Subject: [PATCH] external: honour support of cluster-name legacy flag we have changed the --cluster-name flag to --k8s-cluster-name but to support automation while upgrade we should support the legacy flag Signed-off-by: parth-gr (cherry picked from commit 8e4ec01cbb1c64ef3cbc5e4822a9e2e34adf9c5f) --- .github/workflows/canary-integration-test.yml | 5 +++++ deploy/examples/create-external-cluster-resources.py | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 01596aa07..075e375c3 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -161,6 +161,11 @@ jobs: toolbox=$(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[*].metadata.name}') kubectl -n rook-ceph exec $toolbox -- python3 /etc/ceph/create-external-cluster-resources.py --rbd-data-pool-name replicapool --k8s-cluster-name rookstorage --restricted-auth-permission true + - name: test external script with restricted_auth_permission flag and with --cluster-name legacy flag + run: | + toolbox=$(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[*].metadata.name}') + kubectl -n rook-ceph exec $toolbox -- python3 /etc/ceph/create-external-cluster-resources.py --rbd-data-pool-name replicapool --cluster-name rookstorage --restricted-auth-permission true + - name: test external script with restricted_auth_permission flag run: | toolbox=$(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[*].metadata.name}') diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py index 43b1499be..b9cb69f8a 100644 --- a/deploy/examples/create-external-cluster-resources.py +++ b/deploy/examples/create-external-cluster-resources.py @@ -323,6 +323,11 @@ class RadosJSON: type=str, help="Provides a user name to check the cluster's health status, must be prefixed by 'client.'", ) + common_group.add_argument( + "--cluster-name", + default="", + help="Kubernetes cluster name(legacy flag), Note: Either use this or --k8s-cluster-name", + ) common_group.add_argument( "--k8s-cluster-name", default="", help="Kubernetes cluster name" ) @@ -1508,6 +1513,9 @@ class RadosJSON: def _gen_output_map(self): if self.out_map: return + # support legacy flag with upgrades + if self._arg_parser.cluster_name: + self._arg_parser.k8s_cluster_name = self._arg_parser.cluster_name self._arg_parser.k8s_cluster_name = ( self._arg_parser.k8s_cluster_name.lower() ) # always convert cluster name to lowercase characters