[VOL-3780] Unifying tucson POD pipelines and migrating to voltha charts
Change-Id: I010087d59ae9745904aa1effa0b4bbad5e5b84f1
diff --git a/vars/createKubernetesCluster.groovy b/vars/createKubernetesCluster.groovy
index 48a0bea..36bd510 100644
--- a/vars/createKubernetesCluster.groovy
+++ b/vars/createKubernetesCluster.groovy
@@ -20,9 +20,26 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
+- role: worker
+- role: worker
- role: control-plane
-- role: worker
-- role: worker
+ kubeadmConfigPatches:
+ - |
+ kind: InitConfiguration
+ nodeRegistration:
+ kubeletExtraArgs:
+ node-labels: "ingress-ready=true"
+ extraPortMappings:
+ - containerPort: 80
+ hostPort: 80
+ protocol: TCP
+ - containerPort: 443
+ hostPort: 443
+ protocol: TCP
+ - containerPort: 30115
+ hostPort: 30115
+ - containerPort: 30120
+ hostPort: 30120
"""
writeFile(file: 'kind.cfg', text: data)
diff --git a/vars/getVolthaImageFlags.groovy b/vars/getVolthaImageFlags.groovy
index 334cefd..76dda9d 100644
--- a/vars/getVolthaImageFlags.groovy
+++ b/vars/getVolthaImageFlags.groovy
@@ -27,11 +27,12 @@
break
case "bbsim":
// BBSIM has a different format that voltha, return directly
- return "--set images.bbsim.tag=${tag},images.bbsim.pullPolicy=${pullPolicy}"
+ return "--set images.bbsim.tag=${tag},images.bbsim.pullPolicy=${pullPolicy},images.bbsim.registry='' "
break
default:
+ return ""
break
}
- return "--set ${chart}.images.${image}.tag=${tag},${chart}.images.${image}.pullPolicy=${pullPolicy} "
+ return "--set ${chart}.images.${image}.tag=${tag},${chart}.images.${image}.pullPolicy=${pullPolicy},${chart}.images.${image}.registry='' "
}