Skip to content

Commit

Permalink
Makefile: fix install/upgrade chart (#3678)
Browse files Browse the repository at this point in the history
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
  • Loading branch information
zhangzujian authored and bobz965 committed Jan 31, 2024
1 parent 4071570 commit 589ad33
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,11 @@ kind-install-chart: kind-load-image kind-untaint-control-plane
kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=master --overwrite
kubectl label node -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel --overwrite
helm install kubeovn ./charts \
--set global.images.kubeovn.tag=$(VERSION)
--set global.images.kubeovn.tag=$(VERSION) \
--set networking.NET_STACK=$(shell echo $${NET_STACK:-ipv4} | sed 's/^dual$$/dual_stack/') \
--set networking.ENABLE_SSL=$(shell echo $${ENABLE_SSL:-false}) \
--set func.ENABLE_BIND_LOCAL_IP=$(shell echo $${ENABLE_BIND_LOCAL_IP:-true}) \
--set func.ENABLE_IC=$$(kubectl get node --show-labels | grep -q "ovn.kubernetes.io/ic-gw" && echo true || echo false)
sleep 60
kubectl -n kube-system rollout status --timeout=1s deployment/ovn-central
kubectl -n kube-system rollout status --timeout=1s daemonset/ovs-ovn
Expand All @@ -446,7 +450,8 @@ kind-install-chart: kind-load-image kind-untaint-control-plane
.PHONY: kind-upgrade-chart
kind-upgrade-chart: kind-load-image
helm upgrade kubeovn ./charts \
--set global.images.kubeovn.tag=$(VERSION)
--set global.images.kubeovn.tag=$(VERSION) \
--set func.ENABLE_IC=$$(kubectl get node --show-labels | grep -q "ovn.kubernetes.io/ic-gw" && echo true || echo false)
sleep 90
kubectl -n kube-system rollout status --timeout=1s deployment/ovn-central
kubectl -n kube-system wait pod --for=condition=ready -l app=ovs
Expand Down

0 comments on commit 589ad33

Please sign in to comment.