From e548a5de6a9908ddf0308525373c887e8f6f95bc Mon Sep 17 00:00:00 2001 From: huiwq1990 Date: Mon, 24 Apr 2023 08:38:01 +0800 Subject: [PATCH] fix generated crd name (#1408) Signed-off-by: huiwq1990 --- ...pps.openyurt.io.yaml => apps.openyurt.io_nodepools.yaml} | 0 ...ps.openyurt.io.yaml => apps.openyurt.io_staticpods.yaml} | 0 ...penyurt.io.yaml => apps.openyurt.io_yurtappdaemons.yaml} | 0 ...s.openyurt.io.yaml => apps.openyurt.io_yurtappsets.yaml} | 0 ...ven.openyurt.io.yaml => raven.openyurt.io_gateways.yaml} | 0 hack/make-rules/kustomize_to_chart.sh | 6 ++++++ 6 files changed, 6 insertions(+) rename charts/openyurt/crds/{apiextensions.k8s.io_v1_customresourcedefinition_nodepools.apps.openyurt.io.yaml => apps.openyurt.io_nodepools.yaml} (100%) rename charts/openyurt/crds/{apiextensions.k8s.io_v1_customresourcedefinition_staticpods.apps.openyurt.io.yaml => apps.openyurt.io_staticpods.yaml} (100%) rename charts/openyurt/crds/{apiextensions.k8s.io_v1_customresourcedefinition_yurtappdaemons.apps.openyurt.io.yaml => apps.openyurt.io_yurtappdaemons.yaml} (100%) rename charts/openyurt/crds/{apiextensions.k8s.io_v1_customresourcedefinition_yurtappsets.apps.openyurt.io.yaml => apps.openyurt.io_yurtappsets.yaml} (100%) rename charts/openyurt/crds/{apiextensions.k8s.io_v1_customresourcedefinition_gateways.raven.openyurt.io.yaml => raven.openyurt.io_gateways.yaml} (100%) diff --git a/charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_nodepools.apps.openyurt.io.yaml b/charts/openyurt/crds/apps.openyurt.io_nodepools.yaml similarity index 100% rename from charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_nodepools.apps.openyurt.io.yaml rename to charts/openyurt/crds/apps.openyurt.io_nodepools.yaml diff --git a/charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_staticpods.apps.openyurt.io.yaml b/charts/openyurt/crds/apps.openyurt.io_staticpods.yaml similarity index 100% rename from charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_staticpods.apps.openyurt.io.yaml rename to charts/openyurt/crds/apps.openyurt.io_staticpods.yaml diff --git a/charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_yurtappdaemons.apps.openyurt.io.yaml b/charts/openyurt/crds/apps.openyurt.io_yurtappdaemons.yaml similarity index 100% rename from charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_yurtappdaemons.apps.openyurt.io.yaml rename to charts/openyurt/crds/apps.openyurt.io_yurtappdaemons.yaml diff --git a/charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_yurtappsets.apps.openyurt.io.yaml b/charts/openyurt/crds/apps.openyurt.io_yurtappsets.yaml similarity index 100% rename from charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_yurtappsets.apps.openyurt.io.yaml rename to charts/openyurt/crds/apps.openyurt.io_yurtappsets.yaml diff --git a/charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_gateways.raven.openyurt.io.yaml b/charts/openyurt/crds/raven.openyurt.io_gateways.yaml similarity index 100% rename from charts/openyurt/crds/apiextensions.k8s.io_v1_customresourcedefinition_gateways.raven.openyurt.io.yaml rename to charts/openyurt/crds/raven.openyurt.io_gateways.yaml diff --git a/hack/make-rules/kustomize_to_chart.sh b/hack/make-rules/kustomize_to_chart.sh index b582054c834..a4a714e2568 100755 --- a/hack/make-rules/kustomize_to_chart.sh +++ b/hack/make-rules/kustomize_to_chart.sh @@ -186,6 +186,12 @@ varReference: EOF ${YURT_ROOT}/bin/kustomize build ${output_crd_dir} -o ${crd_dir} + # TODO currently kustomize may not support custom generate names, find more elegant way generate crds + mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_nodepools.apps.openyurt.io.yaml ${crd_dir}/apps.openyurt.io_nodepools.yaml + mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_staticpods.apps.openyurt.io.yaml ${crd_dir}/apps.openyurt.io_staticpods.yaml + mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_yurtappdaemons.apps.openyurt.io.yaml ${crd_dir}/apps.openyurt.io_yurtappdaemons.yaml + mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_yurtappsets.apps.openyurt.io.yaml ${crd_dir}/apps.openyurt.io_yurtappsets.yaml + mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_gateways.raven.openyurt.io.yaml ${crd_dir}/raven.openyurt.io_gateways.yaml # rbac dir local rbac_kustomization_resources=""