From 4372e83bea918c4e9387ec556e52af3075563657 Mon Sep 17 00:00:00 2001
From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Tue, 1 Sep 2020 19:17:20 +0200
Subject: [PATCH] [TREE-WIDE] Use faster version of common secret template

Replace all calls to common.secret with a faster version to save some
linting time.

Issue-ID: OOM-2248
Change-Id: I3372c87226d5dd8b7468ebed2d77e7ceceba5777
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
---
 kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml       | 4 ++--
 kubernetes/common/common/templates/_aafconfig.tpl                     | 4 ++--
 kubernetes/policy/components/policy-drools-pdp/templates/secrets.yaml | 2 +-
 .../policy/components/policy-drools-pdp/templates/statefulset.yaml    | 4 ++--
 kubernetes/so/templates/secret.yaml                                   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml b/kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml
index f9c3377dd8..80c8fca37e 100755
--- a/kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml
@@ -51,9 +51,9 @@ spec:
           - name: AUTH_TYPE
             value: {{ .Values.config.authType }}
           - name: API_USERNAME
-            {{- include "common.secret.envFromSecret" (dict "global" . "uid" "api-credentials" "key" "login") | nindent 12 }}
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "api-credentials" "key" "login") | nindent 12 }}
           - name: API_PASSWORD
-            {{- include "common.secret.envFromSecret" (dict "global" . "uid" "api-credentials" "key" "password") | nindent 12 }}
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "api-credentials" "key" "password") | nindent 12 }}
           - name: LOG_FILE
             value: {{ .Values.config.logFile }}
           - name: ARTIFACT_MANAGER_PORT
diff --git a/kubernetes/common/common/templates/_aafconfig.tpl b/kubernetes/common/common/templates/_aafconfig.tpl
index afc402f648..b1021ab9d7 100644
--- a/kubernetes/common/common/templates/_aafconfig.tpl
+++ b/kubernetes/common/common/templates/_aafconfig.tpl
@@ -117,9 +117,9 @@
     - name: aaf_locator_app_ns
       value: "{{ $aafRoot.app_ns }}"
     - name: DEPLOY_FQI
-    {{- include "common.secret.envFromSecret" (dict "global" $dot "uid" $aafRoot.secret_uid "key" "login") | indent 6 }}
+    {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" $aafRoot.secret_uid "key" "login") | indent 6 }}
     - name: DEPLOY_PASSWORD
-    {{- include "common.secret.envFromSecret" (dict "global" $dot "uid" $aafRoot.secret_uid "key" "password") | indent 6 }}
+    {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" $aafRoot.secret_uid "key" "password") | indent 6 }}
   #Note: want to put this on Nodes, eventually
     - name: cadi_longitude
       value: "{{ default "52.3" $aafRoot.cadi_longitude }}"
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/secrets.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/secrets.yaml
index 7fb84b5ddc..29f2ef2215 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/secrets.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/secrets.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{ include "common.secret" . }}
+{{ include "common.secretFast" . }}
 ---
 apiVersion: v1
 kind: Secret
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index eb1ef4203a..5828be48d7 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -94,9 +94,9 @@ spec:
           - name: REPLICAS
             value: "{{ .Values.replicaCount }}"
           - name: SQL_USER
-            {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-secret" "key" "login") | indent 12 }}
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 12 }}
           - name: SQL_PASSWORD
-            {{- include "common.secret.envFromSecret" (dict "global" . "uid" "db-secret" "key" "password") | indent 12 }}
+            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 12 }}
           volumeMounts:
 {{ include "common.certInitializer.volumeMount" . | indent 10 }}
           - mountPath: /etc/localtime
diff --git a/kubernetes/so/templates/secret.yaml b/kubernetes/so/templates/secret.yaml
index bdcecddfa3..5e9a62f00d 100644
--- a/kubernetes/so/templates/secret.yaml
+++ b/kubernetes/so/templates/secret.yaml
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{ include "common.secret" . }}
+{{ include "common.secretFast" . }}
-- 
2.16.6