[COMAC-222] Change log-agent-configmap in ONOS-ProgRan
Since ONOS and ONOS-ProgRAN have same configmap name, it makes an error.
Change-Id: Id0eb45734dda753efde5e4619de95fb54a490f55
diff --git a/onos-progran/Chart.yaml b/onos-progran/Chart.yaml
index 9699169..0e5700f 100644
--- a/onos-progran/Chart.yaml
+++ b/onos-progran/Chart.yaml
@@ -15,7 +15,7 @@
name: onos-progran
description: ONOS with progran APP
-version: 1.2.4
+version: 1.2.5
icon: https://guide.opencord.org/logos/onos.svg
appVersion: 0.1.8
diff --git a/onos-progran/templates/onos-progran-deployment.yaml b/onos-progran/templates/onos-progran-deployment.yaml
index 9e30bce..9825d67 100644
--- a/onos-progran/templates/onos-progran-deployment.yaml
+++ b/onos-progran/templates/onos-progran-deployment.yaml
@@ -97,7 +97,7 @@
volumeMounts:
- name: onos-logs
mountPath: /onos_logs
- - name: log-agent-configmap-volume
+ - name: progran-log-agent-configmap-volume
mountPath: /conf
{{- end }}
volumes:
@@ -115,9 +115,9 @@
- name: onos-logs
emptyDir: {}
{{- if .Values.log_agent.enabled }}
- - name: log-agent-configmap-volume
+ - name: progran-log-agent-configmap-volume
configMap:
- name: log-agent-configmap
+ name: progran-log-agent-configmap
items:
- key: config
path: filebeat.yml
@@ -135,6 +135,6 @@
{{ toYaml . | indent 8 }}
{{- end }}
{{- if .Values.log_agent.enabled }}
-{{- include "onos.log-agent-configmap" . }}
+{{- include "onos.progran-log-agent-configmap" . }}
{{- end }}
diff --git a/onos-progran/templates/onos-progran-log-agent-configmap.yaml b/onos-progran/templates/onos-progran-log-agent-configmap.yaml
index e94bf33..d0ba3f3 100644
--- a/onos-progran/templates/onos-progran-log-agent-configmap.yaml
+++ b/onos-progran/templates/onos-progran-log-agent-configmap.yaml
@@ -13,12 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
*/ -}}
-{{- define "onos.log-agent-configmap" }}
+{{- define "onos.progran-log-agent-configmap" }}
---
kind: ConfigMap
apiVersion: v1
metadata:
- name: log-agent-configmap
+ name: progran-log-agent-configmap
data:
config: |
---