From 1ca32529adb1b88aa6bfed054d41dc72020ae308 Mon Sep 17 00:00:00 2001
From: Cole Walker <cole.walker@windriver.com>
Date: Thu, 4 Mar 2021 15:59:05 -0500
Subject: [PATCH] Add vars for second rabbitmq instance

A variable for the rabbitmq image in the ptp-ptp-notification pod was
not defined in the values.yaml file and was resulting in armada not
pulling the image from the local repository when available.

This correction also exposed an incorrectly defined imagePullSecret
which has been corrected here.

Story: 2008529
Task: 41997

Signed-off-by: Cole Walker <cole.walker@windriver.com>
Change-Id: I7cf7281d683dd6a6e37a365ddbbc9758b86a747b
---
 .../helm-charts/ptp-notification/templates/daemonset.yaml    | 2 +-
 .../helm-charts/ptp-notification/values.yaml                 | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml
index de17990..23008ff 100644
--- a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml
+++ b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml
@@ -36,7 +36,7 @@ spec:
       {{ end }}
       containers:
       - name: {{ .Chart.Name }}-rabbitmq
-        image: rabbitmq:3-management
+        image: "{{ .Values.notification.image.repository }}:{{ .Values.notification.image.tag }}"
         env:
           - name: THIS_NODE_NAME
             valueFrom:
diff --git a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml
index f312a74..e7db92d 100644
--- a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml
+++ b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml
@@ -45,6 +45,9 @@ registration:
             - "true"
 
 notification:
+  image:
+    repository: rabbitmq
+    tag: 3.8.11-management
   endpoint:
     port: 5672
     user: admin
@@ -66,7 +69,7 @@ location:
     pullPolicy: IfNotPresent
 
 ptptracking:
-  imagePullSecrets: admin-registry-secret
+  imagePullSecrets: default-registry-key
   image:
     repository: starlingx/notificationservice-base
     tag: stx.5.0-v1.0.3