summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--charts/aaf-cm/templates/deployment.yaml2
-rw-r--r--charts/aaf-cs/templates/deployment.yaml6
-rw-r--r--charts/aaf-fs/templates/deployment.yaml2
-rw-r--r--charts/aaf-gui/templates/deployment.yaml2
-rw-r--r--charts/aaf-hello/templates/deployment.yaml2
-rw-r--r--charts/aaf-locate/templates/deployment.yaml2
-rw-r--r--charts/aaf-oauth/templates/deployment.yaml2
-rw-r--r--charts/aaf-service/templates/deployment.yaml2
-rw-r--r--charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml2
-rw-r--r--charts/aaf-sms/templates/deployment.yaml2
-rw-r--r--templates/job.yaml6
11 files changed, 15 insertions, 15 deletions
diff --git a/charts/aaf-cm/templates/deployment.yaml b/charts/aaf-cm/templates/deployment.yaml
index 50c617e..11b0811 100644
--- a/charts/aaf-cm/templates/deployment.yaml
+++ b/charts/aaf-cm/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-cs/templates/deployment.yaml b/charts/aaf-cs/templates/deployment.yaml
index 893c5ac..cfece70 100644
--- a/charts/aaf-cs/templates/deployment.yaml
+++ b/charts/aaf-cs/templates/deployment.yaml
@@ -64,7 +64,7 @@ spec:
lifecycle:
postStart:
exec:
- command:
+ command:
- /bin/sh
- -c
- >
@@ -74,8 +74,8 @@ spec:
cqlsh -u root -p root -f init.cql ;
cqlsh -u root -p root -f osaaf.cql ;
cqlsh -u root -p root -f temp_identity.cql
- resources:
-{{ toYaml .Values.resources | indent 12 }}
+ resources:
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-fs/templates/deployment.yaml b/charts/aaf-fs/templates/deployment.yaml
index b100bc4..d269dc6 100644
--- a/charts/aaf-fs/templates/deployment.yaml
+++ b/charts/aaf-fs/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-gui/templates/deployment.yaml b/charts/aaf-gui/templates/deployment.yaml
index 1aa632b..b24a008 100644
--- a/charts/aaf-gui/templates/deployment.yaml
+++ b/charts/aaf-gui/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-hello/templates/deployment.yaml b/charts/aaf-hello/templates/deployment.yaml
index c9c8223..c76c084 100644
--- a/charts/aaf-hello/templates/deployment.yaml
+++ b/charts/aaf-hello/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-locate/templates/deployment.yaml b/charts/aaf-locate/templates/deployment.yaml
index 2adb92d..6e69f2c 100644
--- a/charts/aaf-locate/templates/deployment.yaml
+++ b/charts/aaf-locate/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-oauth/templates/deployment.yaml b/charts/aaf-oauth/templates/deployment.yaml
index f236185..fd4ae21 100644
--- a/charts/aaf-oauth/templates/deployment.yaml
+++ b/charts/aaf-oauth/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-service/templates/deployment.yaml b/charts/aaf-service/templates/deployment.yaml
index cff8fb2..a07d06f 100644
--- a/charts/aaf-service/templates/deployment.yaml
+++ b/charts/aaf-service/templates/deployment.yaml
@@ -90,7 +90,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml b/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
index 281229f..5eb7b33 100644
--- a/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
+++ b/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
- mountPath: /quorumclient/auth
name: {{ include "common.fullname" . }}-auth
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/charts/aaf-sms/templates/deployment.yaml b/charts/aaf-sms/templates/deployment.yaml
index 58fe72f..189cc0d 100644
--- a/charts/aaf-sms/templates/deployment.yaml
+++ b/charts/aaf-sms/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
- mountPath: /sms/auth
name: {{ include "common.fullname" . }}-auth
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/templates/job.yaml b/templates/job.yaml
index 85c0940..719b6dc 100644
--- a/templates/job.yaml
+++ b/templates/job.yaml
@@ -56,7 +56,7 @@ spec:
- mountPath: /data
name: aaf-persistent-data
- mountPath: /data1/etc
- name: aaf-etc
+ name: aaf-etc
- mountPath: /data1/data
name: aaf-data
- mountPath: /data1/public/iframe_denied_test.html
@@ -102,8 +102,8 @@ spec:
name: aaf-backup
- mountPath: /share
name: aaf-public
- resources:
-{{ toYaml .Values.resources | indent 12 }}
+ resources:
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}