Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade helm to v3.0.1 #589

Merged
merged 3 commits into from
Dec 7, 2019
Merged

Upgrade helm to v3.0.1 #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb0276
Upgrade helm to v3.0.1
hzxuzhonghu Dec 6, 2019
e3ab416
Fix helmv3
hzxuzhonghu Dec 6, 2019
f8e7ff4
Adapte to helm v3
hzxuzhonghu Dec 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/design/queue/queue-state-management.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 2 additions & 13 deletions hack/run-e2e-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions installer/helm/chart/volcano/templates/batch_v1alpha1_job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions installer/helm/chart/volcano/templates/bus_v1alpha1_command.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions installer/helm/chart/volcano/templates/default-queue.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions installer/helm/chart/volcano/templates/scheduling_v1alpha1_podgroup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions installer/helm/chart/volcano/templates/scheduling_v1alpha1_queue.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions installer/volcano-development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,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:
Expand Down Expand Up @@ -573,8 +571,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:
Expand Down Expand Up @@ -623,8 +619,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:
Expand Down Expand Up @@ -667,8 +661,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:
Expand Down