Removed the default values as they are now ineffective with proper de…

…faults set for each pod type separately.
mastodon · Feb 23, 2023 · a7419b5 · a7419b5
1 parent 02ae2ff
commit a7419b5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
@@ -122,7 +122,7 @@ spec:
               mountPath: /opt/mastodon/public/system
           {{- end }}
           resources:
-            {{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }}
+            {{- toYaml (default $context.Values.mastodon.sidekiq.resources .resources) | nindent 12 }}
       {{- with $context.Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml
@@ -70,7 +70,7 @@ spec:
             httpGet:
               path: /api/v1/streaming/health
               port: streaming
-          {{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
+          {{- with .Values.mastodon.streaming.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
@@ -126,7 +126,7 @@ spec:
               port: http
             failureThreshold: 30
             periodSeconds: 5
-          {{- with (default .Values.resources .Values.mastodon.web.resources) }}
+          {{- with .Values.mastodon.web.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/values.yaml b/values.yaml
@@ -443,19 +443,6 @@ revisionPodAnnotation: true
 # The annotations set with jobAnnotations will be added to all job pods.
 jobAnnotations: {}
 
-# -- Default resources for all Deployments and jobs unless overwritten
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
 # @ignored
 nodeSelector: {}