From 39ed53daebe6f53854a96e1b01d81dc816b44ba2 Mon Sep 17 00:00:00 2001 From: Dmitry Makhrovsky <690243+bop0hz@users.noreply.github.com> Date: Tue, 10 Jan 2023 02:49:12 +0300 Subject: [PATCH] Fix python-crd-cmd.sh cli options and improve verbosity in preprocess (#235) * Missed colon added * pass client version added to options * added verbosity to crd gen --- openapi/preprocess_spec.py | 2 ++ openapi/python-crd-cmd.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 openapi/python-crd-cmd.sh diff --git a/openapi/preprocess_spec.py b/openapi/preprocess_spec.py index fdda133..ade8546 100644 --- a/openapi/preprocess_spec.py +++ b/openapi/preprocess_spec.py @@ -174,6 +174,7 @@ def drop_paths(spec): group_prefix_reversed = '.'.join(group_prefix.split('.')[::-1]) for k, v in spec['paths'].items(): if k.startswith('/apis/' + group_prefix_reversed): + print("Adding Custom Resource api path %s" %k) paths[k] = v else: print("Ignoring non Custom Resource api path %s" %k) @@ -318,6 +319,7 @@ def filter_api_group(spec): models = {} for k, v in spec['definitions'].items(): if k.startswith(os.environ.get('KUBERNETES_CRD_GROUP_PREFIX')): + print("Adding Custom Resource by prefix %s" %k) models[k] = v elif k.startswith("io.k8s"): print("Removing builtin Kubernetes Resource %s" %k) diff --git a/openapi/python-crd-cmd.sh b/openapi/python-crd-cmd.sh old mode 100644 new mode 100755 index cb09155..85d0bf5 --- a/openapi/python-crd-cmd.sh +++ b/openapi/python-crd-cmd.sh @@ -20,9 +20,9 @@ print_usage() { echo " -h: hide generation timestamp" >& 2 } -while getopts 'c:g:h:n:l:p:o' flag; do +while getopts 'c:g:h:n:l:p:o:' flag; do case "${flag}" in - c) CLIENT_VERSION="${CLIENT_VERSION}" ;; + c) CLIENT_VERSION="${OPTARG}" ;; g) GENERATE_APIS="${OPTARG}" ;; h) HIDE_GENERATION_TIMESTAMP="${OPTARG}" ;; n) KUBERNETES_CRD_GROUP_PREFIX="${OPTARG}" ;;