[VOL-4247] Using latest upstream ONOS chart and removing custom onos-config-loader from the voltha-infra-chart

Change-Id: I7560442c0c2e57d0a589ce00b1c07ca6b7aa6777
diff --git a/voltha-infra/templates/etcd-periodic-defrag.yaml b/voltha-infra/templates/etcd-periodic-defrag.yaml
index 29b8083..3144f03 100644
--- a/voltha-infra/templates/etcd-periodic-defrag.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag.yaml
@@ -25,11 +25,11 @@
       template:
         spec:
           restartPolicy: OnFailure
-          serviceAccountName: "{{ .Release.Name }}-onos-config-loader-service-account"
+          serviceAccountName: "{{ .Release.Name }}-service-account"
           containers:
             - name: etcd-db-defrag
-              image: '{{ tpl .Values.images.onos_config_loader.registry . }}{{ tpl .Values.images.onos_config_loader.repository . }}:{{ tpl .Values.images.onos_config_loader.tag . }}'
-              imagePullPolicy: {{ tpl .Values.images.onos_config_loader.pullPolicy . }}
+              image: '{{ tpl .Values.etcd.defrag.image.registry . }}{{ tpl .Values.etcd.defrag.image.repository . }}:{{ tpl .Values.etcd.defrag.image.tag . }}'
+              imagePullPolicy: {{ tpl .Values.etcd.defrag.image.pullPolicy . }}
               command:
                 - /bin/sh
                 - -c