From a7fca3d1584131198687d0fa976c7c81ebcef423 Mon Sep 17 00:00:00 2001 From: TommyLike Date: Mon, 20 May 2019 10:29:44 +0800 Subject: [PATCH] Remove unnecessary folder --- README.md | 12 ++++++------ hack/run-e2e-kind.sh | 4 ++-- installer/chart/{volcano => }/Chart.yaml | 0 installer/chart/{volcano => }/config/kube-batch.conf | 0 .../gen-admission-secret/gen-admission-secret.sh | 0 .../plugins/gen-admission-secret/plugin.yaml | 0 .../{volcano => }/templates/admission-config.yaml | 0 .../chart/{volcano => }/templates/admission.yaml | 0 .../{volcano => }/templates/batch_v1alpha1_job.yaml | 0 .../templates/bus_v1alpha1_command.yaml | 0 .../chart/{volcano => }/templates/controllers.yaml | 0 .../chart/{volcano => }/templates/default-queue.yaml | 0 .../chart/{volcano => }/templates/scheduler.yaml | 0 .../templates/scheduling_v1alpha1_podgroup.yaml | 0 .../templates/scheduling_v1alpha1_queue.yaml | 0 installer/chart/{volcano => }/values.yaml | 0 16 files changed, 8 insertions(+), 8 deletions(-) rename installer/chart/{volcano => }/Chart.yaml (100%) rename installer/chart/{volcano => }/config/kube-batch.conf (100%) rename installer/chart/{volcano => }/plugins/gen-admission-secret/gen-admission-secret.sh (100%) rename installer/chart/{volcano => }/plugins/gen-admission-secret/plugin.yaml (100%) rename installer/chart/{volcano => }/templates/admission-config.yaml (100%) rename installer/chart/{volcano => }/templates/admission.yaml (100%) rename installer/chart/{volcano => }/templates/batch_v1alpha1_job.yaml (100%) rename installer/chart/{volcano => }/templates/bus_v1alpha1_command.yaml (100%) rename installer/chart/{volcano => }/templates/controllers.yaml (100%) rename installer/chart/{volcano => }/templates/default-queue.yaml (100%) rename installer/chart/{volcano => }/templates/scheduler.yaml (100%) rename installer/chart/{volcano => }/templates/scheduling_v1alpha1_podgroup.yaml (100%) rename installer/chart/{volcano => }/templates/scheduling_v1alpha1_queue.yaml (100%) rename installer/chart/{volcano => }/values.yaml (100%) diff --git a/README.md b/README.md index 1b66ff4173..a3db80393c 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,9 @@ make images ## Verify your images # docker images REPOSITORY TAG IMAGE ID CREATED SIZE -volcanosh/volcano-admission latest a83338506638 8 seconds ago 41.4MB -volcanosh/volcano-scheduler latest faa3c2a25ac3 9 seconds ago 49.6MB -volcanosh/volcano-controllers latest 7b11606ebfb8 10 seconds ago 44.2MB +volcanosh/vk-admission latest a83338506638 8 seconds ago 41.4MB +volcanosh/vk-kube-batch latest faa3c2a25ac3 9 seconds ago 49.6MB +volcanosh/vk-controllers latest 7b11606ebfb8 10 seconds ago 44.2MB ``` @@ -97,7 +97,7 @@ kubernetes API server. ``` #1. Install helm plugin -helm plugin install installer/chart/volcano/plugins/gen-admission-secret +helm plugin install installer/chart/plugins/gen-admission-secret #2. Generate secret within service name helm gen-admission-secret --service -admission-service --namespace @@ -112,10 +112,10 @@ helm gen-admission-secret --service volcano-trial-admission-service --namespace Finally, install helm chart. ``` -helm install installer/chart/volcano --namespace --name +helm install installer/chart --namespace --name For eg : -helm install installer/chart/volcano --namespace volcano-trial --name volcano-trial +helm install installer/chart --namespace volcano-trial --name volcano-trial ``` diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh index 341c8899de..884b5002cd 100755 --- a/hack/run-e2e-kind.sh +++ b/hack/run-e2e-kind.sh @@ -63,7 +63,7 @@ function install-volcano { kind load docker-image ${MPI_EXAMPLE_IMAGE} ${CLUSTER_CONTEXT} echo "Install volcano plugin into cluster...." - helm plugin install --kubeconfig ${KUBECONFIG} installer/chart/volcano/plugins/gen-admission-secret + helm plugin install --kubeconfig ${KUBECONFIG} installer/chart/plugins/gen-admission-secret #If failed to generate secret for admission service, return immediately helm gen-admission-secret --service ${CLUSTER_NAME}-admission-service --namespace kube-system @@ -73,7 +73,7 @@ function install-volcano { fi echo "Install volcano chart" - helm install installer/chart/volcano --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --wait + helm install installer/chart --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --wait } function uninstall-volcano { diff --git a/installer/chart/volcano/Chart.yaml b/installer/chart/Chart.yaml similarity index 100% rename from installer/chart/volcano/Chart.yaml rename to installer/chart/Chart.yaml diff --git a/installer/chart/volcano/config/kube-batch.conf b/installer/chart/config/kube-batch.conf similarity index 100% rename from installer/chart/volcano/config/kube-batch.conf rename to installer/chart/config/kube-batch.conf diff --git a/installer/chart/volcano/plugins/gen-admission-secret/gen-admission-secret.sh b/installer/chart/plugins/gen-admission-secret/gen-admission-secret.sh similarity index 100% rename from installer/chart/volcano/plugins/gen-admission-secret/gen-admission-secret.sh rename to installer/chart/plugins/gen-admission-secret/gen-admission-secret.sh diff --git a/installer/chart/volcano/plugins/gen-admission-secret/plugin.yaml b/installer/chart/plugins/gen-admission-secret/plugin.yaml similarity index 100% rename from installer/chart/volcano/plugins/gen-admission-secret/plugin.yaml rename to installer/chart/plugins/gen-admission-secret/plugin.yaml diff --git a/installer/chart/volcano/templates/admission-config.yaml b/installer/chart/templates/admission-config.yaml similarity index 100% rename from installer/chart/volcano/templates/admission-config.yaml rename to installer/chart/templates/admission-config.yaml diff --git a/installer/chart/volcano/templates/admission.yaml b/installer/chart/templates/admission.yaml similarity index 100% rename from installer/chart/volcano/templates/admission.yaml rename to installer/chart/templates/admission.yaml diff --git a/installer/chart/volcano/templates/batch_v1alpha1_job.yaml b/installer/chart/templates/batch_v1alpha1_job.yaml similarity index 100% rename from installer/chart/volcano/templates/batch_v1alpha1_job.yaml rename to installer/chart/templates/batch_v1alpha1_job.yaml diff --git a/installer/chart/volcano/templates/bus_v1alpha1_command.yaml b/installer/chart/templates/bus_v1alpha1_command.yaml similarity index 100% rename from installer/chart/volcano/templates/bus_v1alpha1_command.yaml rename to installer/chart/templates/bus_v1alpha1_command.yaml diff --git a/installer/chart/volcano/templates/controllers.yaml b/installer/chart/templates/controllers.yaml similarity index 100% rename from installer/chart/volcano/templates/controllers.yaml rename to installer/chart/templates/controllers.yaml diff --git a/installer/chart/volcano/templates/default-queue.yaml b/installer/chart/templates/default-queue.yaml similarity index 100% rename from installer/chart/volcano/templates/default-queue.yaml rename to installer/chart/templates/default-queue.yaml diff --git a/installer/chart/volcano/templates/scheduler.yaml b/installer/chart/templates/scheduler.yaml similarity index 100% rename from installer/chart/volcano/templates/scheduler.yaml rename to installer/chart/templates/scheduler.yaml diff --git a/installer/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml b/installer/chart/templates/scheduling_v1alpha1_podgroup.yaml similarity index 100% rename from installer/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml rename to installer/chart/templates/scheduling_v1alpha1_podgroup.yaml diff --git a/installer/chart/volcano/templates/scheduling_v1alpha1_queue.yaml b/installer/chart/templates/scheduling_v1alpha1_queue.yaml similarity index 100% rename from installer/chart/volcano/templates/scheduling_v1alpha1_queue.yaml rename to installer/chart/templates/scheduling_v1alpha1_queue.yaml diff --git a/installer/chart/volcano/values.yaml b/installer/chart/values.yaml similarity index 100% rename from installer/chart/volcano/values.yaml rename to installer/chart/values.yaml