etcd cluster chart and usage in voltha requirements
Addition of a chart dedicated to creating etcdCluster CRD instances from an already installed etcd-operator
This is good for specifying custom etcd images, retention periods, and custom repo locations.
Also helpful in installing instances of an etcdCluster separate from installing etcd-operator
Modify the voltha chart to require the etcd-cluster chart rather than etcd-operator, given the etcd instance is whats truly required.
This allows the upgrade/removal of voltha to take its etcd-cluster with it, without removing etcd-operator.
Update the voltha chart to make the inclusion of freeradius optional and remove unused consul config references.
Tested by running:
helm install -n cord-kafka incubator/kafka --set persistence.enabled=false --set zookeeper.persistence.enabled=false
helm install -n etcd-operator stable/etcd-operator
wait for etcdclusters CRD to be created...
helm dep update ~/source/helm-charts/voltha
helm install -n voltha ~/source/helm-charts/voltha
Change-Id: I7001943d74fdbd38f4d786982c70908ba24fd0ca
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index d2d876f..44b0103 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -16,7 +16,7 @@
{{- define "voltha-vcore.cmd" }}
- "voltha/voltha/main.py"
-- "--etcd=etcd-cluster.default.svc.cluster.local:2379"
+- "--etcd={{ .Values.etcdReleaseName }}.default.svc.cluster.local:2379"
- "--kafka={{ .Values.kafkaReleaseName }}.default.svc.cluster.local"
- "--rest-port=8880"
- "--grpc-port=50556"
diff --git a/voltha/templates/envoy_for_etcd.yaml b/voltha/templates/envoy_for_etcd.yaml
index 92092bc..5966076 100644
--- a/voltha/templates/envoy_for_etcd.yaml
+++ b/voltha/templates/envoy_for_etcd.yaml
@@ -58,7 +58,7 @@
- "-envoy-cfg-template=/envoy/voltha-grpc-proxy.template.json"
- "-envoy-config=/envoy/voltha-grpc-proxy.json"
- "-kv=etcd"
- - "-kv-svc-name=etcd-cluster.default.svc.cluster.local"
+ - "-kv-svc-name={{ .Values.etcdReleaseName }}.default.svc.cluster.local"
- "-kv-port=2379"
ports:
- containerPort: 8882
diff --git a/voltha/templates/freeradius-config.yaml b/voltha/templates/freeradius-config.yaml
index 2e54c5e..92229d8 100644
--- a/voltha/templates/freeradius-config.yaml
+++ b/voltha/templates/freeradius-config.yaml
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+{{- if .Values.freeradius.enabled }}
apiVersion: v1
data:
clients.conf: |
@@ -26,3 +27,4 @@
name: freeradius-config
namespace: {{ .Values.global.namespace }}
serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+{{- end}}
diff --git a/voltha/templates/freeradius.yaml b/voltha/templates/freeradius.yaml
index 8f9eaea..ef86b16 100644
--- a/voltha/templates/freeradius.yaml
+++ b/voltha/templates/freeradius.yaml
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+{{- if .Values.freeradius.enabled }}
apiVersion: v1
kind: Service
metadata:
@@ -91,3 +92,4 @@
- name: freeradius-config
configMap:
name: freeradius-config
+{{- end}}