Merge pull request #2985 from lowang-bh/helm-install

use one helm command to install resource

.gitignore

@@ -133,5 +133,4 @@ coverage.txt
 vendor
 
 # helm dependency files
-installer/helm/chart/volcano/charts/
 installer/helm/chart/volcano/requirements.lock

hack/generate-yaml.sh

@@ -80,7 +80,7 @@ fi
 # Step2. update helm templates from config dir
 HELM_TEMPLATES_DIR=${VK_ROOT}/installer/helm/chart/volcano/templates
 HELM_VOLCANO_CRD_DIR=${VK_ROOT}/installer/helm/chart/volcano/crd
-HELM_JOBFLOW_CRD_DIR=${VK_ROOT}/installer/helm/chart/jobflow/crd
+HELM_JOBFLOW_CRD_DIR=${VK_ROOT}/installer/helm/chart/volcano/charts/jobflow/crd
 VOLCANO_CRD_DIR=${VK_ROOT}/config/crd/volcano
 JOBFLOW_CRD_DIR=${VK_ROOT}/config/crd/jobflow
 echo Updating templates in $HELM_TEMPLATES_DIR
@@ -124,7 +124,6 @@ fi
 cat ${VK_ROOT}/installer/namespace.yaml > ${DEPLOYMENT_FILE}
 
 # Volcano
-${HELM_BIN_DIR}/helm dependency update ${VK_ROOT}/installer/helm/chart/volcano 
 ${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespace volcano-system \
       --name-template volcano --set basic.image_tag_version=${VOLCANO_IMAGE_TAG} --set basic.crd_version=${CRD_VERSION}\
       -s templates/admission.yaml \
@@ -139,7 +138,7 @@ ${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano --namespac
       >> ${DEPLOYMENT_FILE}
 
 # JobFlow
-${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/jobflow --namespace volcano-system \
+${HELM_BIN_DIR}/helm template ${VK_ROOT}/installer/helm/chart/volcano/charts/jobflow --namespace volcano-system \
       --name-template volcano --set basic.image_tag_version=${VOLCANO_IMAGE_TAG} --set basic.crd_version=${CRD_VERSION}\
       -s templates/flow_v1alpha1_jobflows.yaml \
       -s templates/flow_v1alpha1_jobtemplates.yaml \

hack/local-up-volcano.sh

@@ -40,7 +40,6 @@ function prepare {
 function install-volcano {
   # TODO: add a graceful way waiting for all crd ready
   kubectl create namespace volcano-system 
-  helm dependency build
   helm install volcano ${VK_ROOT}/installer/helm/chart/volcano --namespace volcano-system \
   --set basic.image_tag_version=${TAG} \
   --set basic.image_pull_policy=IfNotPresent 

hack/run-e2e-kind.sh

@@ -54,7 +54,6 @@ function install-volcano {
   kubectl apply -f installer/namespace.yaml
 
   echo "Install volcano chart with crd version $crd_version"
-  helm dependency update installer/helm/chart/volcano
   helm install ${CLUSTER_NAME} installer/helm/chart/volcano --namespace volcano-system --kubeconfig ${KUBECONFIG} \
     --set basic.image_pull_policy=IfNotPresent \
     --set basic.image_tag_version=${TAG} \

installer/helm/chart/volcano/Chart.yaml

@@ -1,16 +1,16 @@
 apiVersion: v1
 description: A Helm chart for Volcano
 name: volcano
-version: 1.5
-appVersion: 0.1
+version: "1.5"
+appVersion: "0.1"
 icon: https://raw.githubusercontent.com/volcano-sh/charts/master/docs/images/volcano-logo.png
 home: https://volcano.sh
 sources:
   - https://github.com/volcano-sh/volcano
 dependencies:
 - name: jobflow
   version: "1.0.0"
-  repository: "file://../jobflow"
+  repository: "file://../charts/jobflow"
 maintainers:
   - name: k82cn
     email: [email protected]

installer/helm/chart/volcano/charts/jobflow/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+appVersion: "0.1"
+description: A Helm chart for Volcano-Job-flow
+name: jobflow
+type: application
+version: 1.0.0