From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Sun, 5 Mar 2023 15:59:33 +0000 (+0000)
Subject: Merge "[COMMON] Fix resources indent"
X-Git-Tag: 12.0.0~105
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e9fe498f17933a78ae3fcbea3502dc8b7fc545a1;hp=-c;p=oom.git

Merge "[COMMON] Fix resources indent"
---

e9fe498f17933a78ae3fcbea3502dc8b7fc545a1
diff --combined kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
index 36e2eef3b7,c6e6a52c6d..23ef33b79b
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
@@@ -28,22 -28,6 +28,22 @@@ spec
      metadata: {{- include "common.templateMetadata" . | nindent 6 }}
      spec:
        initContainers:
 +{{- if .Values.config.useStrimziKafka }}
 +      - command:
 +          - /app/ready.py
 +        args:
 +          - --container-name
 +          - message-router
 +        env:
 +          - name: NAMESPACE
 +            valueFrom:
 +              fieldRef:
 +                apiVersion: v1
 +                fieldPath: metadata.namespace
 +        image: {{ include "repositoryGenerator.image.readiness" . }}
 +        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
 +        name: {{ include "common.name" . }}-readiness
 +{{- end }}
        - command:
          - sh
          args:
@@@ -106,8 -90,7 +106,7 @@@
              readOnly: true
            - mountPath: /opt/app/policy/clamp/etc/mounted
              name: ac-http-ppnt-config-processed
-           resources:
- {{ include "common.resources" . }}
+           resources: {{ include "common.resources" . | nindent 12 }}
          {{- if .Values.nodeSelector }}
          nodeSelector:
  {{ toYaml .Values.nodeSelector | indent 10 }}
diff --combined kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
index bae782b2f6,32426371c8..f511723b9c
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
@@@ -28,22 -28,6 +28,22 @@@ spec
      metadata: {{- include "common.templateMetadata" . | nindent 6 }}
      spec:
        initContainers:
 +{{- if .Values.config.useStrimziKafka }}
 +      - command:
 +          - /app/ready.py
 +        args:
 +          - --container-name
 +          - message-router
 +        env:
 +          - name: NAMESPACE
 +            valueFrom:
 +              fieldRef:
 +                apiVersion: v1
 +                fieldPath: metadata.namespace
 +        image: {{ include "repositoryGenerator.image.readiness" . }}
 +        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
 +        name: {{ include "common.name" . }}-readiness
 +{{- end }}
        - command:
          - sh
          args:
@@@ -106,8 -90,7 +106,7 @@@
              readOnly: true
            - mountPath: /opt/app/policy/clamp/etc/mounted
              name: ac-k8s-ppnt-config-processed
-           resources:
- {{ include "common.resources" . }}
+           resources: {{ include "common.resources" . | nindent 12 }}
          {{- if .Values.nodeSelector }}
          nodeSelector:
  {{ toYaml .Values.nodeSelector | indent 10 }}
diff --combined kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
index aa124ff9ef,1a181c021d..4cd73b35f9
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/templates/deployment.yaml
@@@ -28,22 -28,6 +28,22 @@@ spec
      metadata: {{- include "common.templateMetadata" . | nindent 6 }}
      spec:
        initContainers:
 +{{- if .Values.config.useStrimziKafka }}
 +      - command:
 +          - /app/ready.py
 +        args:
 +          - --container-name
 +          - message-router
 +        env:
 +          - name: NAMESPACE
 +            valueFrom:
 +              fieldRef:
 +                apiVersion: v1
 +                fieldPath: metadata.namespace
 +        image: {{ include "repositoryGenerator.image.readiness" . }}
 +        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
 +        name: {{ include "common.name" . }}-readiness
 +{{- end }}
        - command:
          - sh
          args:
@@@ -114,8 -98,7 +114,7 @@@
              readOnly: true
            - mountPath: /opt/app/policy/clamp/etc/mounted
              name: ac-pf-ppnt-config-processed
-           resources:
- {{ include "common.resources" . }}
+           resources: {{ include "common.resources" . | nindent 12 }}
          {{- if .Values.nodeSelector }}
          nodeSelector:
  {{ toYaml .Values.nodeSelector | indent 10 }}