Fix duplicate imagePullPolicy in ponsimv2 chart
Change-Id: I3d9dbe474e3b7d86158ceecb5de1150feb93e2b2
diff --git a/ponsimv2/Chart.yaml b/ponsimv2/Chart.yaml
index 46b3498..fff8a10 100644
--- a/ponsimv2/Chart.yaml
+++ b/ponsimv2/Chart.yaml
@@ -17,7 +17,7 @@
description: PON Simulator
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.1
+version: 1.0.2
# VOLTHA version
appVersion: 1.5.0
diff --git a/ponsimv2/templates/olt.yaml b/ponsimv2/templates/olt.yaml
index 6a7b6c3..8026068 100644
--- a/ponsimv2/templates/olt.yaml
+++ b/ponsimv2/templates/olt.yaml
@@ -44,7 +44,7 @@
spec:
containers:
- name: olt
- image: {{ .Values.global.registry }}{{ .Values.images.olt.repository }}:{{ tpl .Values.images.olt.tag . }}
+ image: "{{ .Values.global.registry }}{{ .Values.images.olt.repository }}:{{ tpl .Values.images.olt.tag . }}"
imagePullPolicy: {{ .Values.images.olt.pullPolicy }}
env:
- name: POD_IP
@@ -55,7 +55,6 @@
valueFrom:
fieldRef:
fieldPath: metadata.namespace
-
args:
- "/app/ponsim"
- "-device_type"
@@ -69,9 +68,6 @@
- "-vcore_endpoint"
- "vcore"
- "-promiscuous"
-
ports:
- containerPort: 50060
name: grpc-port
-
- imagePullPolicy: {{ .Values.images.olt.pullPolicy }}
diff --git a/ponsimv2/templates/onu.yaml b/ponsimv2/templates/onu.yaml
index b29fc33..6179fc2 100644
--- a/ponsimv2/templates/onu.yaml
+++ b/ponsimv2/templates/onu.yaml
@@ -54,10 +54,9 @@
values:
- rg
topologyKey: kubernetes.io/hostname
-
containers:
- name: onu
- image: {{ .Values.global.registry }}{{ .Values.images.onu.repository }}:{{ tpl .Values.images.onu.tag . }}
+ image: "{{ .Values.global.registry }}{{ .Values.images.onu.repository }}:{{ tpl .Values.images.onu.tag . }}"
imagePullPolicy: {{ .Values.images.onu.pullPolicy }}
env:
- name: POD_IP
@@ -68,7 +67,6 @@
valueFrom:
fieldRef:
fieldPath: metadata.namespace
-
args:
- "/app/ponsim"
- "-device_type"
@@ -86,5 +84,3 @@
ports:
- containerPort: 50061
name: grpc-port
-
- imagePullPolicy: {{ .Values.images.olt.pullPolicy }}
diff --git a/ponsimv2/templates/rg.yaml b/ponsimv2/templates/rg.yaml
index ba4f840..e96c59c 100644
--- a/ponsimv2/templates/rg.yaml
+++ b/ponsimv2/templates/rg.yaml
@@ -41,7 +41,7 @@
topologyKey: kubernetes.io/hostname
containers:
- name: rg
- image: {{ .Values.global.registry }}{{ .Values.images.rg.repository }}:{{ tpl .Values.images.rg.tag . }}
+ image: "{{ .Values.global.registry }}{{ .Values.images.rg.repository }}:{{ tpl .Values.images.rg.tag . }}"
imagePullPolicy: {{ .Values.images.rg.pullPolicy }}
env:
- name: POD_IP
@@ -53,6 +53,5 @@
fieldRef:
fieldPath: metadata.namespace
command: [ "/bin/bash", "-c", "trap : TERM INT; sleep infinity & wait" ]
- imagePullPolicy: {{ .Values.images.olt.pullPolicy }}
securityContext:
privileged: true