Upgrade Helm version to 2.16 for CiaB and sample comac configs
Also removed unnecessary override values from COMAC sample.
Change-Id: Id7683f68cca61564ef7f8d5c3cee6f436db9a10e
diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index aa5faf6..79a101e 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -11,7 +11,7 @@
KUBESPRAY_VERSION ?= release-2.11
DOCKER_VERSION ?= 18.09
K8S_VERSION ?= v1.15.3
-HELM_VERSION ?= v2.15.0
+HELM_VERSION ?= v2.16.1
# used to start logging/monitoring and other infrastructure charts
INFRA_CHARTS ?=
@@ -89,7 +89,6 @@
-e "{'docker_iptables_enabled' : True}" \
-e "{'kube_version' : $(K8S_VERSION)}" \
-e "{'kube_network_plugin_multus' : True, 'multus_version' : stable}" \
- -e "{'kube_proxy_mode': iptables}" \
-e "{'kube_proxy_metrics_bind_address' : 0.0.0.0:10249}" \
-e "{'kube_pods_subnet' : 192.168.0.0/17, 'kube_service_addresses' : 192.168.128.0/17}" \
-e "{'kube_apiserver_node_port_range' : 2000-36767}" \
@@ -122,10 +121,10 @@
$(M)/platform: | $(M)/helm-ready $(WORKSPACE)/cord/helm-charts $(WORKSPACE)/cord/cord-platform
cd $(WORKSPACE)/cord/cord-platform && \
helm dep update cord-platform && \
- helm install $(HELM_GLOBAL_ARGS) --name cord-platform cord-platform -f $(CIABVALUES)
+ helm upgrade --install $(HELM_GLOBAL_ARGS) cord-platform cord-platform -f $(CIABVALUES)
cd $(WORKSPACE)/cord/helm-charts && \
helm dep update comac && \
- helm install $(HELM_GLOBAL_ARGS) --name comac comac -f $(CIABVALUES)
+ helm upgrade --install $(HELM_GLOBAL_ARGS) comac comac -f $(CIABVALUES)
touch $@
/opt/cni/bin/simpleovs: | $(M)/k8s-ready
@@ -154,8 +153,8 @@
cd $(WORKSPACE)/cord/helm-charts/omec; \
helm dep up omec-data-plane && \
helm dep up omec-control-plane && \
- helm install $(HELM_GLOBAL_ARGS) --namespace omec --name omec-data-plane omec-data-plane -f $(CIABVALUES) && \
- helm install $(HELM_GLOBAL_ARGS) --namespace omec --name omec-control-plane omec-control-plane -f $(CIABVALUES)
+ helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-data-plane omec-data-plane -f $(CIABVALUES) && \
+ helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-control-plane omec-control-plane -f $(CIABVALUES)
$(WORKSPACE)/cord/helm-charts/scripts/wait_for_pods.sh omec
touch $@
@@ -177,7 +176,7 @@
sudo ip addr add 127.0.0.2/8 dev lo || true
$(eval mme_iface=$(shell ip -4 route list default | awk -F 'dev' '{ print $$2; exit }' | awk '{ print $$1 }'))
cd $(WORKSPACE)/cord/helm-charts; \
- helm install $(HELM_GLOBAL_ARGS) --namespace omec --name oaisim oaisim -f $(CIABVALUES) \
+ helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec oaisim oaisim -f $(CIABVALUES) \
--set config.enb.networks.s1_mme.interface=$(mme_iface)
$(WORKSPACE)/cord/helm-charts/scripts/wait_for_pods.sh omec
@timeout 60s bash -c \