Merge metrics chart into crds

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Jun 27, 2021 · 930bacf · 930bacf
1 parent c4b8659
commit 930bacf
Show file tree

Hide file tree

Showing 12 changed files with 27,905 additions and 28,011 deletions.
diff --git a/...s.appscode.com_metricsconfigurations.yaml → ...s.appscode.com_metricsconfigurations.yaml b/...s.appscode.com_metricsconfigurations.yaml → ...s.appscode.com_metricsconfigurations.yaml
diff --git a/...metrics/templates/metrics-user-roles.yaml → ...db-crds/templates/metrics-user-roles.yaml b/...metrics/templates/metrics-user-roles.yaml → ...db-crds/templates/metrics-user-roles.yaml
diff --git a/charts/kubedb-metrics/.helmignore b/charts/kubedb-metrics/.helmignore
diff --git a/charts/kubedb-metrics/Chart.yaml b/charts/kubedb-metrics/Chart.yaml
diff --git a/charts/kubedb-metrics/README.md b/charts/kubedb-metrics/README.md
diff --git a/charts/kubedb-metrics/doc.yaml b/charts/kubedb-metrics/doc.yaml
diff --git a/charts/kubedb-metrics/templates/NOTES.txt b/charts/kubedb-metrics/templates/NOTES.txt
diff --git a/charts/kubedb-metrics/values.yaml b/charts/kubedb-metrics/values.yaml
diff --git a/hack/scripts/ct.sh b/hack/scripts/ct.sh
@@ -21,7 +21,7 @@ for dir in charts/*/; do
     dir=${dir##*/}
     num_files=$(find charts/${dir}/templates -type f | wc -l)
     echo $dir
-    if [ $num_files -le 1 ] || [[ "$dir" =~ "-metrics" ]]; then
+    if [ $num_files -le 1 ] || [[ "$dir" =~ "-crds" ]]; then
         make ct CT_COMMAND=lint TEST_CHARTS=charts/$dir
     else
         make ct TEST_CHARTS=charts/$dir

diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh
@@ -47,6 +47,7 @@ fi
 
 crd-importer \
     --input=${crd_dir} \
+    --input=https://github.com/kmodules/custom-resources/raw/kubernetes-1.21.1/crds/metrics.appscode.com_metricsconfigurations.v1.yaml \
     --out=./charts/kubedb-crds/crds
 
 crd-importer \
@@ -62,7 +63,3 @@ crd-importer --v=v1beta1 \
     --input=${crd_dir} \
     --out=. --output-yaml=kubedb-catalog-crds.yaml \
     --group=catalog.kubedb.com
-
-crd-importer \
-    --input=https://github.com/kmodules/custom-resources/raw/kubernetes-1.21.1/crds/metrics.appscode.com_metricsconfigurations.v1.yaml \
-    --out=./charts/kubedb-metrics/crds