diff --git a/.gitignore b/.gitignore index 84bb98a48..971dfa95d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /bin -/charts/charts/*.tgz +/charts/clusterpedia/charts/*.tgz .idea # OSX trash diff --git a/charts/artifacthub-repo.yml b/charts/artifacthub-repo.yml new file mode 100644 index 000000000..65e37dbf7 --- /dev/null +++ b/charts/artifacthub-repo.yml @@ -0,0 +1,5 @@ +owners: # (optional, used to claim repository ownership) + - name: clusterpedia + email: caiwei95@hotmail.com + - name: RuliXu + email: lily.xu@daocloud.io diff --git a/charts/.helmignore b/charts/clusterpedia/.helmignore similarity index 100% rename from charts/.helmignore rename to charts/clusterpedia/.helmignore diff --git a/charts/Chart.lock b/charts/clusterpedia/Chart.lock similarity index 100% rename from charts/Chart.lock rename to charts/clusterpedia/Chart.lock diff --git a/charts/Chart.yaml b/charts/clusterpedia/Chart.yaml similarity index 100% rename from charts/Chart.yaml rename to charts/clusterpedia/Chart.yaml diff --git a/charts/README.md b/charts/clusterpedia/README.md similarity index 100% rename from charts/README.md rename to charts/clusterpedia/README.md diff --git a/charts/_crds/cluster.clusterpedia.io_clustersyncresources.yaml b/charts/clusterpedia/_crds/cluster.clusterpedia.io_clustersyncresources.yaml similarity index 100% rename from charts/_crds/cluster.clusterpedia.io_clustersyncresources.yaml rename to charts/clusterpedia/_crds/cluster.clusterpedia.io_clustersyncresources.yaml diff --git a/charts/_crds/cluster.clusterpedia.io_pediaclusters.yaml b/charts/clusterpedia/_crds/cluster.clusterpedia.io_pediaclusters.yaml similarity index 100% rename from charts/_crds/cluster.clusterpedia.io_pediaclusters.yaml rename to charts/clusterpedia/_crds/cluster.clusterpedia.io_pediaclusters.yaml diff --git a/charts/_crds/policy.clusterpedia.io_clusterimportpolicies.yaml b/charts/clusterpedia/_crds/policy.clusterpedia.io_clusterimportpolicies.yaml similarity index 100% rename from charts/_crds/policy.clusterpedia.io_clusterimportpolicies.yaml rename to charts/clusterpedia/_crds/policy.clusterpedia.io_clusterimportpolicies.yaml diff --git a/charts/_crds/policy.clusterpedia.io_pediaclusterlifecycles.yaml b/charts/clusterpedia/_crds/policy.clusterpedia.io_pediaclusterlifecycles.yaml similarity index 100% rename from charts/_crds/policy.clusterpedia.io_pediaclusterlifecycles.yaml rename to charts/clusterpedia/_crds/policy.clusterpedia.io_pediaclusterlifecycles.yaml diff --git a/charts/templates/NOTES.txt b/charts/clusterpedia/templates/NOTES.txt similarity index 100% rename from charts/templates/NOTES.txt rename to charts/clusterpedia/templates/NOTES.txt diff --git a/charts/templates/_helpers.tpl b/charts/clusterpedia/templates/_helpers.tpl similarity index 100% rename from charts/templates/_helpers.tpl rename to charts/clusterpedia/templates/_helpers.tpl diff --git a/charts/templates/apiserver-apiservice.yaml b/charts/clusterpedia/templates/apiserver-apiservice.yaml similarity index 100% rename from charts/templates/apiserver-apiservice.yaml rename to charts/clusterpedia/templates/apiserver-apiservice.yaml diff --git a/charts/templates/apiserver-deployment.yaml b/charts/clusterpedia/templates/apiserver-deployment.yaml similarity index 100% rename from charts/templates/apiserver-deployment.yaml rename to charts/clusterpedia/templates/apiserver-deployment.yaml diff --git a/charts/templates/apiserver-service.yaml b/charts/clusterpedia/templates/apiserver-service.yaml similarity index 100% rename from charts/templates/apiserver-service.yaml rename to charts/clusterpedia/templates/apiserver-service.yaml diff --git a/charts/templates/apiserver-serviceaccount.yaml b/charts/clusterpedia/templates/apiserver-serviceaccount.yaml similarity index 100% rename from charts/templates/apiserver-serviceaccount.yaml rename to charts/clusterpedia/templates/apiserver-serviceaccount.yaml diff --git a/charts/templates/clusterrole.yaml b/charts/clusterpedia/templates/clusterrole.yaml similarity index 100% rename from charts/templates/clusterrole.yaml rename to charts/clusterpedia/templates/clusterrole.yaml diff --git a/charts/templates/clusterrolebinding.yaml b/charts/clusterpedia/templates/clusterrolebinding.yaml similarity index 100% rename from charts/templates/clusterrolebinding.yaml rename to charts/clusterpedia/templates/clusterrolebinding.yaml diff --git a/charts/templates/clustersynchro-manager-deployment.yaml b/charts/clusterpedia/templates/clustersynchro-manager-deployment.yaml similarity index 100% rename from charts/templates/clustersynchro-manager-deployment.yaml rename to charts/clusterpedia/templates/clustersynchro-manager-deployment.yaml diff --git a/charts/templates/clustersynchro-manager-serviceaccount.yaml b/charts/clusterpedia/templates/clustersynchro-manager-serviceaccount.yaml similarity index 100% rename from charts/templates/clustersynchro-manager-serviceaccount.yaml rename to charts/clusterpedia/templates/clustersynchro-manager-serviceaccount.yaml diff --git a/charts/templates/controller-manager-deployment.yaml b/charts/clusterpedia/templates/controller-manager-deployment.yaml similarity index 100% rename from charts/templates/controller-manager-deployment.yaml rename to charts/clusterpedia/templates/controller-manager-deployment.yaml diff --git a/charts/templates/controller-manager-serviceaccount.yaml b/charts/clusterpedia/templates/controller-manager-serviceaccount.yaml similarity index 100% rename from charts/templates/controller-manager-serviceaccount.yaml rename to charts/clusterpedia/templates/controller-manager-serviceaccount.yaml diff --git a/charts/templates/customresourcedefinitions.yaml b/charts/clusterpedia/templates/customresourcedefinitions.yaml similarity index 100% rename from charts/templates/customresourcedefinitions.yaml rename to charts/clusterpedia/templates/customresourcedefinitions.yaml diff --git a/charts/templates/internalstorage-configmap.yaml b/charts/clusterpedia/templates/internalstorage-configmap.yaml similarity index 100% rename from charts/templates/internalstorage-configmap.yaml rename to charts/clusterpedia/templates/internalstorage-configmap.yaml diff --git a/charts/templates/internalstorage-local-pv-check-job.yaml b/charts/clusterpedia/templates/internalstorage-local-pv-check-job.yaml similarity index 100% rename from charts/templates/internalstorage-local-pv-check-job.yaml rename to charts/clusterpedia/templates/internalstorage-local-pv-check-job.yaml diff --git a/charts/templates/internalstorage-local-pv.yaml b/charts/clusterpedia/templates/internalstorage-local-pv.yaml similarity index 100% rename from charts/templates/internalstorage-local-pv.yaml rename to charts/clusterpedia/templates/internalstorage-local-pv.yaml diff --git a/charts/templates/internalstorage-secret.yaml b/charts/clusterpedia/templates/internalstorage-secret.yaml similarity index 100% rename from charts/templates/internalstorage-secret.yaml rename to charts/clusterpedia/templates/internalstorage-secret.yaml diff --git a/charts/values.yaml b/charts/clusterpedia/values.yaml similarity index 100% rename from charts/values.yaml rename to charts/clusterpedia/values.yaml diff --git a/charts/index.yaml b/charts/index.yaml new file mode 100644 index 000000000..62c4e6983 --- /dev/null +++ b/charts/index.yaml @@ -0,0 +1,25 @@ +apiVersion: v1 +entries: + clusterpedia: + - apiVersion: v2 + appVersion: v0.4.1 + created: "2022-08-16T10:11:44.68276+08:00" + dependencies: + - condition: postgresql.enabled + name: postgresql + repository: https://charts.bitnami.com/bitnami + version: 11.6.0 + - condition: mysql.enabled + name: mysql + repository: https://charts.bitnami.com/bitnami + version: 9.1.2 + - name: common + repository: https://charts.bitnami.com/bitnami + version: 1.14.2 + description: A Helm chart for Kubernetes + name: clusterpedia + type: application + urls: + - https://github.com/clusterpedia-io/clusterpedia/releases/download/v0.4.1/clusterpedia-0.4.1.tgz + version: 0.4.1 +generated: "2022-08-16T10:11:44.669932+08:00" diff --git a/deploy/cluster.clusterpedia.io_clustersyncresources.yaml b/deploy/cluster.clusterpedia.io_clustersyncresources.yaml index 19dd3e5a8..e26c3887a 120000 --- a/deploy/cluster.clusterpedia.io_clustersyncresources.yaml +++ b/deploy/cluster.clusterpedia.io_clustersyncresources.yaml @@ -1 +1 @@ -../charts/_crds/cluster.clusterpedia.io_clustersyncresources.yaml \ No newline at end of file +../charts/clusterpedia/_crds/cluster.clusterpedia.io_clustersyncresources.yaml \ No newline at end of file diff --git a/deploy/cluster.clusterpedia.io_pediaclusers.yaml b/deploy/cluster.clusterpedia.io_pediaclusers.yaml deleted file mode 120000 index 2280824b2..000000000 --- a/deploy/cluster.clusterpedia.io_pediaclusers.yaml +++ /dev/null @@ -1 +0,0 @@ -../charts/_crds/cluster.clusterpedia.io_pediaclusters.yaml \ No newline at end of file diff --git a/deploy/cluster.clusterpedia.io_pediaclusters.yaml b/deploy/cluster.clusterpedia.io_pediaclusters.yaml new file mode 120000 index 000000000..8435ad43f --- /dev/null +++ b/deploy/cluster.clusterpedia.io_pediaclusters.yaml @@ -0,0 +1 @@ +../charts/clusterpedia/_crds/cluster.clusterpedia.io_pediaclusters.yaml \ No newline at end of file diff --git a/deploy/policy.clusterpedia.io_clusterimportpolicies.yaml b/deploy/policy.clusterpedia.io_clusterimportpolicies.yaml index 0bfb05e9a..c395006f0 120000 --- a/deploy/policy.clusterpedia.io_clusterimportpolicies.yaml +++ b/deploy/policy.clusterpedia.io_clusterimportpolicies.yaml @@ -1 +1 @@ -../charts/_crds/policy.clusterpedia.io_clusterimportpolicies.yaml \ No newline at end of file +../charts/clusterpedia/_crds/policy.clusterpedia.io_clusterimportpolicies.yaml \ No newline at end of file diff --git a/deploy/policy.clusterpedia.io_pediaclusterlifecycles.yaml b/deploy/policy.clusterpedia.io_pediaclusterlifecycles.yaml index 8e6f8016f..423d4b09d 120000 --- a/deploy/policy.clusterpedia.io_pediaclusterlifecycles.yaml +++ b/deploy/policy.clusterpedia.io_pediaclusterlifecycles.yaml @@ -1 +1 @@ -../charts/_crds/policy.clusterpedia.io_pediaclusterlifecycles.yaml \ No newline at end of file +../charts/clusterpedia/_crds/policy.clusterpedia.io_pediaclusterlifecycles.yaml \ No newline at end of file diff --git a/hack/update-crds.sh b/hack/update-crds.sh index e294b2800..786a506e8 100755 --- a/hack/update-crds.sh +++ b/hack/update-crds.sh @@ -14,5 +14,5 @@ GOPATH=$(go env GOPATH | awk -F ':' '{print $1}') export PATH=$PATH:$GOPATH/bin cd "${API_ROOT}" -controller-gen crd paths=./cluster/... output:crd:dir="${REPO_ROOT}/charts/_crds" -controller-gen crd paths=./policy/... output:crd:dir="${REPO_ROOT}/charts/_crds" +controller-gen crd paths=./cluster/... output:crd:dir="${REPO_ROOT}/charts/clusterpedia/_crds" +controller-gen crd paths=./policy/... output:crd:dir="${REPO_ROOT}/charts/clusterpedia/_crds" diff --git a/hack/verify-crds.sh b/hack/verify-crds.sh index 2b3ce4a73..dca6f80d0 100755 --- a/hack/verify-crds.sh +++ b/hack/verify-crds.sh @@ -6,7 +6,7 @@ set -o pipefail SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -DIFFROOT="${SCRIPT_ROOT}/charts/_crds" +DIFFROOT="${SCRIPT_ROOT}/charts/clusterpedia/_crds" TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/crds" _tmp="${SCRIPT_ROOT}/_tmp" diff --git a/test/helper.sh b/test/helper.sh index c99bd1220..c5887ff5e 100755 --- a/test/helper.sh +++ b/test/helper.sh @@ -60,10 +60,10 @@ function delete_cluster() { # install the Clusterpedia into the kind cluster function install_clusterpedia() { - kubectl apply -f "${ROOT}/charts/_crds" + kubectl apply -f "${ROOT}/charts/clusterpedia/_crds" helm repo add bitnami https://charts.bitnami.com/bitnami - helm dependency build "${ROOT}/charts" - helm install clusterpedia "${ROOT}/charts" \ + helm dependency build "${ROOT}/charts/clusterpedia" + helm install clusterpedia "${ROOT}/charts/clusterpedia" \ --namespace clusterpedia-system \ --create-namespace \ --wait \