Merge pull request #589 from hzxuzhonghu/helm-upgrade

Upgrade helm to v3.0.1
volcano-sh · Dec 7, 2019 · 415c354 · 415c354
2 parents f975dd4 + f8e7ff4
commit 415c354
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 42 deletions.
diff --git a/docs/design/queue/queue-state-management.md b/docs/design/queue/queue-state-management.md
@@ -122,8 +122,6 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: {{ .Release.Name }}-validate-queue
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade,post-delete
 webhooks:
   - clientConfig:
       caBundle: ""
@@ -171,8 +169,6 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
   name: {{ .Release.Name }}-mutate-queue
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade,post-delete
 webhooks:
   - clientConfig:
       caBundle: ""

diff --git a/hack/lib/install.sh b/hack/lib/install.sh
@@ -60,7 +60,7 @@ function install-helm {
     HELM_TEMP_DIR=`mktemp -d`
     curl https://raw.githubusercontent.com/helm/helm/master/scripts/get > ${HELM_TEMP_DIR}/get_helm.sh
     #TODO: There are some issue with helm's latest version, remove '--version' when it get fixed.
-    chmod 700 ${HELM_TEMP_DIR}/get_helm.sh && ${HELM_TEMP_DIR}/get_helm.sh   --version v2.13.0
+    chmod 700 ${HELM_TEMP_DIR}/get_helm.sh && ${HELM_TEMP_DIR}/get_helm.sh   --version v3.0.1
   else
     echo -n "found helm, version: " && helm version
   fi

diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh
@@ -25,32 +25,21 @@ function kind-up-cluster {
 }
 
 function install-volcano {
-  echo "Preparing helm tiller service account"
-  kubectl create serviceaccount --namespace kube-system tiller
-  kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
-
   install-helm
-  helm init --service-account tiller --kubeconfig ${KUBECONFIG} --wait
 
   echo "Pulling required docker images"
   docker pull ${MPI_EXAMPLE_IMAGE}
   docker pull ${TF_EXAMPLE_IMAGE}
 
-  echo "Loading docker images into kind cluster"
-  kind load docker-image ${MPI_EXAMPLE_IMAGE}  ${CLUSTER_CONTEXT}
-  kind load docker-image ${TF_EXAMPLE_IMAGE} ${CLUSTER_CONTEXT}
-
   echo "Install volcano chart"
-  helm install installer/helm/chart/volcano --namespace kube-system --name ${CLUSTER_NAME} --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=config/volcano-scheduler-ci.conf --wait
+  helm install ${CLUSTER_NAME} installer/helm/chart/volcano --namespace kube-system  --kubeconfig ${KUBECONFIG} --set basic.image_tag_version=${TAG} --set basic.scheduler_config_file=config/volcano-scheduler-ci.conf --wait
 }
 
 function uninstall-volcano {
-  helm delete ${CLUSTER_NAME} --purge --kubeconfig ${KUBECONFIG}
+  helm uninstall ${CLUSTER_NAME} -n kube-system
 }
 
 function generate-log {
-    echo "Generating tiller log files"
-    kubectl logs deployment/tiller-deploy -n kube-system > helm-tiller.log
     echo "Generating volcano log files"
     kubectl logs deployment/${CLUSTER_NAME}-admission -n kube-system > volcano-admission.log
     kubectl logs deployment/${CLUSTER_NAME}-controllers -n kube-system > volcano-controller.log

diff --git a/installer/helm/chart/volcano/templates/batch_v1alpha1_job.yaml b/installer/helm/chart/volcano/templates/batch_v1alpha1_job.yaml
@@ -2,8 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: jobs.batch.volcano.sh
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: batch.volcano.sh
   names:

diff --git a/installer/helm/chart/volcano/templates/bus_v1alpha1_command.yaml b/installer/helm/chart/volcano/templates/bus_v1alpha1_command.yaml
@@ -2,8 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: commands.bus.volcano.sh
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: bus.volcano.sh
   names:

diff --git a/installer/helm/chart/volcano/templates/default-queue.yaml b/installer/helm/chart/volcano/templates/default-queue.yaml
diff --git a/installer/helm/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml b/installer/helm/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml
@@ -2,8 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: podgroups.scheduling.incubator.k8s.io
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: scheduling.incubator.k8s.io
   names:

diff --git a/installer/helm/chart/volcano/templates/scheduling_v1alpha1_queue.yaml b/installer/helm/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
@@ -2,8 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: queues.scheduling.incubator.k8s.io
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: scheduling.incubator.k8s.io
   names:

diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
@@ -374,8 +374,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: jobs.batch.volcano.sh
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: batch.volcano.sh
   names:
@@ -576,8 +574,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: commands.bus.volcano.sh
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: bus.volcano.sh
   names:
@@ -626,8 +622,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: podgroups.scheduling.incubator.k8s.io
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: scheduling.incubator.k8s.io
   names:
@@ -670,8 +664,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: queues.scheduling.incubator.k8s.io
-  annotations:
-    "helm.sh/hook": crd-install
 spec:
   group: scheduling.incubator.k8s.io
   names: