Helm add resource block linkerd-jaeger chart (#7627)

* added resource block jaeger-injector helm chart Signed-off-by: yuriydzobak <yurii.dzobak@lotusflare.com>
linkerd · Jan 18, 2022 · c6b98c3 · c6b98c3
1 parent 9fdecdc
commit c6b98c3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/jaeger/charts/linkerd-jaeger/README.md b/jaeger/charts/linkerd-jaeger/README.md
@@ -121,6 +121,10 @@ Kubernetes: `>=1.20.0-0`
 | webhook.namespaceSelector | string | `nil` |  |
 | webhook.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information |
 | webhook.objectSelector | string | `nil` |  |
+| webhook.resources.cpu.limit | string | `nil` | Maximum amount of CPU units that the jaeger-injector container can use |
+| webhook.resources.cpu.request | string | `nil` | Amount of CPU units that the jaeger-injector container requests |
+| webhook.resources.memory.limit | string | `nil` | Maximum amount of memory that jaeger-injector container can use |
+| webhook.resources.memory.request | string | `nil` | Amount of memory that the jaeger-injector container requests |
 | webhook.tolerations | string | `nil` | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information |
 
 ----------------------------------------------

diff --git a/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml b/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml
@@ -62,6 +62,9 @@ spec:
         - mountPath: /var/run/linkerd/tls
           name: tls
           readOnly: true
+        {{- if .Values.webhook.resources -}}
+        {{- include "partials.resources" .Values.webhook.resources | nindent 8 }}
+        {{- end }}
       serviceAccountName: jaeger-injector
       volumes:
       - name: tls

diff --git a/jaeger/charts/linkerd-jaeger/values.yaml b/jaeger/charts/linkerd-jaeger/values.yaml
@@ -19,7 +19,6 @@ enablePSP: false
 
 # -- Kubernetes DNS Domain name to use
 clusterDomain: cluster.local
-
 collector:
   # -- Set to false to exclude collector installation
   enabled: true
@@ -184,6 +183,18 @@ webhook:
     #matchLabels:
     #  foo: bar
 
+  resources:
+    cpu:
+      # -- Maximum amount of CPU units that the jaeger-injector container can use
+      limit:
+      # -- Amount of CPU units that the jaeger-injector container requests
+      request:
+    memory:
+      # -- Maximum amount of memory that jaeger-injector container can use
+      limit:
+      # -- Amount of memory that the jaeger-injector container requests
+      request:
+
   # -- NodeSelector section, See the
   # [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information
   nodeSelector: *default_node_selector

diff --git a/jaeger/cmd/testdata/install_collector_disabled.golden b/jaeger/cmd/testdata/install_collector_disabled.golden
diff --git a/jaeger/cmd/testdata/install_default.golden b/jaeger/cmd/testdata/install_default.golden
diff --git a/jaeger/cmd/testdata/install_jaeger_disabled.golden b/jaeger/cmd/testdata/install_jaeger_disabled.golden