voltctl: update ingress configuration after redeployment in berlin-lab
* handover cluster variable for helm deployments of voltha-infra and
voltha-stack (volthaInfraDeploy.groovy and volthaStackDeploy.groovy
are called from vars/volthaDeploy.groovy) to allow usage of it in
'helm upgrade --install' commands
* replace default virtualhost ingress (enableVirtualHosts=true) for
voltha-infra and voltha-stack with specific ingress host, by using
cluster variable (paths also needs to be defined, since there is not
default for it when defining a specific host)
* adapt volt config generation for physical-build jobs to use '.'
instead of '-' when adding the value of the cluster variable to align
with settings for bbsim voltctl configuration
* set default value 'local' for cluster variable when using it in
volthaInfraDeploy.groovy context (to set voltha-infra.local as default
ingress hostname)
* set default value 'voltha.local' for cluster variable when using it in
volthaStackDeploy.groovy context (to set voltha.voltha.local as
default ingress hostname)
Change-Id: I06ff30b1dafd054232f6f1d62fb0798a92a747a8
Signed-off-by: Jan Klare <jan.klare@bisdn.de>
diff --git a/vars/volthaInfraDeploy.groovy b/vars/volthaInfraDeploy.groovy
index 8ec3008..773cbb0 100644
--- a/vars/volthaInfraDeploy.groovy
+++ b/vars/volthaInfraDeploy.groovy
@@ -96,6 +96,7 @@
// location of the kubernetes config file,
// if null we assume it's stored in the $KUBECONFIG
kubeconfig: null,
+ cluster: 'local'
]
Map cfg = defaultConfig + config
@@ -145,7 +146,8 @@
--set etcd.statefulset.replicaCount=${cfg.etcdReplica} \
--set etcd.replicaCount=${cfg.etcdReplica} \
--set etcd.ingress.enabled=true \
- --set etcd.ingress.enableVirtualHosts=true \
+ --set etcd.ingress.hosts[0].host=voltha-infra.${cfg.cluster} \
+ --set etcd.ingress.hosts[0].paths[0]='/etcdserverpb.KV/' \
-f $WORKSPACE/voltha-helm-charts/examples/${serviceConfigFile}-values.yaml ${cfg.extraHelmFlags}
""")