From a7ac7f022a8d2553d637ad8bf5fe3f12b65aa76e Mon Sep 17 00:00:00 2001
From: miroslavmasaryk <miroslav.masaryk@telekom.com>
Date: Wed, 1 Mar 2023 14:12:26 +0100
Subject: [COMMON] Fix resources indent

Fix of resources template indent and therefore resources in components

Issue-ID: OOM-3104

Signed-off-by: miroslavmasaryk <miroslav.masaryk@telekom.com>
Change-Id: I825a3860db00cae4bb80b2aa2d82ac1a42b33124
---
 .../multicloud/components/multicloud-fcaps/templates/deployment.yaml   | 3 +--
 .../multicloud/components/multicloud-k8s/templates/deployment.yaml     | 3 +--
 .../multicloud/components/multicloud-pike/templates/deployment.yaml    | 3 +--
 .../multicloud/components/multicloud-vio/templates/deployment.yaml     | 3 +--
 .../components/multicloud-windriver/templates/deployment.yaml          | 2 +-
 kubernetes/multicloud/templates/deployment.yaml                        | 3 +--
 6 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'kubernetes/multicloud')

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index 2750f5f145..7a19fcfc0b 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
@@ -65,8 +65,7 @@ spec:
        - mountPath: /opt/fcaps/fcaps/pub/config/log.yml
          name: fcaps-logconfig
          subPath: log.yml
-       resources:
-{{ include "common.resources" . | indent 12 }}
+       resources: {{ include "common.resources" . | nindent 9 }}
        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 45494e1730..571360da1c 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -62,8 +62,7 @@ spec:
           - mountPath: /opt/multicloud/k8splugin/k8sconfig.json
             name: {{ include "common.name" .}}
             subPath: k8sconfig.json
-        resources:
-{{ include "common.resources" . | indent 10 }}
+        resources: {{ include "common.resources" . | nindent 10 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index 3174dae242..a8d876a73f 100644
--- a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@ -65,8 +65,7 @@ spec:
        - mountPath: /opt/pike/pike/pub/config/log.yml
          name: pike-logconfig
          subPath: log.yml
-       resources:
-{{ include "common.resources" . | indent 12 }}
+       resources: {{ include "common.resources" . | nindent 9 }}
        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        command: ["/bin/sh"]
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
index c5c368c8b5..d00d78b004 100644
--- a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
@@ -64,8 +64,7 @@ spec:
        - mountPath: /opt/vio/vio/pub/config/log.yml
          name: vio-logconfig
          subPath: log.yml
-       resources:
-{{ include "common.resources" . | indent 12 }}
+       resources: {{ include "common.resources" . | nindent 9 }}
        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index 8eadcf689d..dc9ef23aaa 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -76,7 +76,7 @@ spec:
           subPath: log.yml
         - mountPath: /opt/artifacts/
           name: artifact-data
-        resources: {{ include "common.resources" . | nindent 12 }}
+        resources: {{ include "common.resources" . | nindent 10 }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         ports:
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index 5e1090798e..2cfba3f257 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -59,8 +59,7 @@ spec:
          value: "{{- if (include "common.needTLS" .) }}https{{ else }}http{{ end }}"
        - name: SSL_ENABLED
          value: "{{- if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}"
-       resources:
-{{ include "common.resources" . | indent 12 }}
+       resources: {{ include "common.resources" . | nindent 9 }}
        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        name: {{ include "common.name" . }}
-- 
cgit 1.2.3-korg