From e9fa90a028af92d6cd4fcc5d59bd9b00309c2c5b Mon Sep 17 00:00:00 2001
From: Takamasa Takenaka <takamasa.takenaka@windriver.com>
Date: Mon, 29 Nov 2021 15:55:02 -0300
Subject: [PATCH] Modify values.yml to match expected format

When system application-apply, the script will download
containers and upload them to the local registry.
(This process includes repository re-written with
system parameter configuration)

Current in values.yaml of snmp armada app, only
stx-snmp container configuration matched to the
expected pattern. So that the script downloaded
only stx-snmp container but no other two containers.

This fix modifies the format in values.xml to
match the expected pattern (No value changes for
repositories nor tags)

Test Plan:
PASS: Apply snmp-armada-app and confirm the followings:
      - Status becomes "applied"
      - All 3 containers download from configured repository
      - All 3 containers are in the local repository

Closes-bug: 1952654

Signed-off-by: Takamasa Takenaka <takamasa.takenaka@windriver.com>
Change-Id: I8b742a2e211717b343f459443b15e947e5c6bd92
---
 .../snmp/templates/deployment.yaml            | 16 +++++-----
 .../helm-charts/snmp/values.yaml              | 31 ++++++++++++-------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml
index de20a21..bc03596 100755
--- a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml
+++ b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml
@@ -29,8 +29,8 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.snmp.image.repository }}:{{ .Values.snmp.image.tag }}"
+          imagePullPolicy: {{ .Values.snmp.pull_policy }}
           ports:
           - containerPort: 161
             protocol: UDP
@@ -63,9 +63,9 @@ spec:
           volumeMounts:
           - name: snmpd-etc-volume
             mountPath: /etc/snmp
-        - name: {{ .Values.image.subagent_name }}
-          image: "{{ .Values.image.repository_subagent }}:{{ .Values.image.tag_subagent }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy_subagent }}
+        - name: {{ .Values.subagent.name }}
+          image: "{{ .Values.subagent.image.repository }}:{{ .Values.subagent.image.tag }}"
+          imagePullPolicy: {{ .Values.subagent.pull_policy }}
           volumeMounts:
           - name: snmpd-fm-volume
             mountPath: /etc/fm/
@@ -105,9 +105,9 @@ spec:
           #   timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
           #   successThreshold: {{ .Values.readinessProbe.successThreshold }}
           #   failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-        - name: {{ .Values.image.trap_subagent_name }}
-          image: "{{ .Values.image.repository_trap_subagent }}:{{ .Values.image.tag_trap_subagent }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy_trap_subagent }}
+        - name: {{ .Values.trap_subagent.name }}
+          image: "{{ .Values.trap_subagent.image.repository }}:{{ .Values.trap_subagent.image.tag }}"
+          imagePullPolicy: {{ .Values.trap_subagent.pull_policy }}
           ports:
           - containerPort: 162
             protocol: TCP
diff --git a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml
index 4eca0ab..39168dc 100755
--- a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml
+++ b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml
@@ -4,18 +4,27 @@
 
 replicaCount: 1
 
+snmp:
+  image:
+    repository: docker.io/starlingx/stx-snmp
+    tag: stx.6.0-v1.0.1
+  pull_policy: IfNotPresent
+
+subagent:
+  name: sub-agent
+  image:
+    repository: docker.io/starlingx/stx-fm-subagent
+    tag: stx.6.0-v1.0.3
+  pull_policy: IfNotPresent
+
+trap_subagent:
+  name: trap-subagent
+  image:
+    repository: docker.io/starlingx/stx-fm-trap-subagent
+    tag: stx.6.0-v1.0.2
+  pull_policy: IfNotPresent
+
 image:
-  repository: docker.io/starlingx/stx-snmp
-  tag: stx.6.0-v1.0.1
-  pullPolicy: IfNotPresent
-  subagent_name: sub-agent
-  repository_subagent: docker.io/starlingx/stx-fm-subagent
-  tag_subagent: stx.6.0-v1.0.3
-  pullPolicy_subagent: IfNotPresent
-  trap_subagent_name: trap-subagent
-  repository_trap_subagent: docker.io/starlingx/stx-fm-trap-subagent
-  tag_trap_subagent: stx.6.0-v1.0.2
-  pullPolicy_trap_subagent: IfNotPresent
   debug: ''
 
 nameOverride: ""