diff options
Diffstat (limited to 'kubernetes/so/charts/so-catalog-db-adapter/templates')
| -rwxr-xr-x | kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml | 6 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml index 48d9ef8820..a03dbd8930 100755 --- a/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml +++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml @@ -26,8 +26,4 @@ metadata: name: {{ include "common.fullname" . }}-app-configmap namespace: {{ include "common.namespace" . }} data: - {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}} - {{- $root := . }} - {{- range $path, $bytes := .Files.Glob $yamlpath }} - override.yaml: {{ $root.Files.Get $path | quote }} - {{- end }}
\ No newline at end of file +{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }} diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml index d235545aa3..a69c189c5b 100755 --- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml @@ -47,12 +47,7 @@ spec: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} resources: - requests: - memory: {{ index .Values.resources.requests.memory}} - cpu: {{ index .Values.resources.requests.cpu}} - limits: - memory: {{ index .Values.resources.limits.memory}} - cpu: {{ index .Values.resources.limits.cpu}} +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} env: - name: DB_HOST valueFrom: @@ -141,4 +136,4 @@ spec: configMap: name: {{ include "common.fullname" . }}-app-configmap imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" |