Merge "[COMMON] Fix resources indent"
authorAndreas Geissler <andreas-geissler@telekom.de>
Sun, 5 Mar 2023 15:59:33 +0000 (15:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sun, 5 Mar 2023 15:59:33 +0000 (15:59 +0000)
1  2 
kubernetes/policy/components/policy-clamp-ac-http-ppnt/templates/deployment.yaml
kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
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:
              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 }}
@@@ -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:
              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 }}
@@@ -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:
              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 }}