Fix logsidecar's template format

Signed-off-by: pixiake <guofeng@yunify.com>
eltonbfw · Oct 30, 2021 · 890db56 · 890db56
1 parent abf9acc
commit 890db56
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/roles/ks-devops/templates/ks-devops-values.yaml.j2 b/roles/ks-devops/templates/ks-devops-values.yaml.j2
@@ -19,13 +19,13 @@ authentication:
 serviceAccount:
   create: true
 
-resources:
-  limits:
-    cpu: {{ devops.resources.limits.memory | default("200m") }}
-    memory: {{ devops.resources.limits.memory | default("200Mi") }}
-  requests:
-    cpu: {{ devops.resources.requests.memory | default("20m") }}
-    memory: {{ devops.resources.requests.memory | default("50Mi") }}
+resources: {}
+  # limits:
+  #   cpu: {{ devops.resources.limits.memory | default("200m") }}
+  #   memory: {{ devops.resources.limits.memory | default("200Mi") }}
+  # requests:
+  #   cpu: {{ devops.resources.requests.memory | default("20m") }}
+  #   memory: {{ devops.resources.requests.memory | default("50Mi") }}
 
 {% if devops.nodeSelector is defined and devops.nodeSelector is not none %}
 nodeSelector:

diff --git a/roles/ks-logging/files/logsidecar-injector/templates/deploy.yaml b/roles/ks-logging/files/logsidecar-injector/templates/deploy.yaml
@@ -58,15 +58,15 @@ spec:
           - mountPath: /etc/localtime
             name: host-time
             readOnly: true
-      {{ - with .Values.nodeSelector }}
+      {{- with .Values.nodeSelector }}
       nodeSelector:
-      {{ toYaml . | indent 8 }}
-      {{ - end }}
+        {{ toYaml . | indent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{ - with .Values.affinity }}
+      {{- with .Values.affinity }}
       affinity:
-      {{ toYaml . | indent 8 }}
-      {{ - end }}
+        {{ toYaml . | indent 8 }}
+      {{- end }}
diff --git a/roles/ks-logging/templates/custom-values-logsidecar-injector.yaml.j2 b/roles/ks-logging/templates/custom-values-logsidecar-injector.yaml.j2
@@ -31,22 +31,22 @@ configReloader:
       memory: 10Mi
 
 {% if logging.nodeSelector is defined and logging.nodeSelector is not none %}
-  nodeSelector:
-    {{ logging.nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
+nodeSelector:
+  {{ logging.nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
 {% elif nodeSelector is defined and nodeSelector is not none %}
-  nodeSelector:
-    {{ nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
+nodeSelector:
+  {{ nodeSelector | to_nice_yaml(indent=2) | indent(4) }}
 {% else %}
-  nodeSelector: {}
+nodeSelector: {}
 {% endif %}
 {% if logging.tolerations is defined and logging.tolerations is not none %}
-  tolerations:
-    {{ logging.tolerations | to_nice_yaml(indent=2) | indent(4) }}
+tolerations:
+  {{ logging.tolerations | to_nice_yaml(indent=2) | indent(4) }}
 {% elif tolerations is defined and tolerations is not none %}
-  tolerations:
-    {{ tolerations | to_nice_yaml(indent=2) | indent(4) }}
+tolerations:
+  {{ tolerations | to_nice_yaml(indent=2) | indent(4) }}
 {% else %}
-  tolerations: []
+tolerations: []
 {% endif %}
 {% if logging.affinity is defined and logging.affinity is not none %}
 affinity: