Add operator tolerations

instana-agent/Chart.yaml

@@ -10,25 +10,25 @@ description: Instana Agent for Kubernetes
 home: https://www.instana.com/
 icon: https://agents.instana.io/helm/stan-logo-2020.png
 maintainers:
-- email: felix.marx@ibm.com
-  name: FelixMarxIBM
-- email: fredrik.gundersen@ibm.com
-  name: FredrikAtIBM
-- email: jefiyamj@ibm.com
-  name: Jefiya-MJ
-- email: konrad.ohms@de.ibm.com
-  name: Konrad-Ohms
-- email: Krishnapriya.RS@ibm.com
-  name: Krishnapriya-RS
-- email: milica.cvrkota@ibm.com
-  name: Milica-Cvrkota-IBM
-- email: Nagaraj.Kandoor@ibm.com
-  name: nagaraj-kandoor
-- email: Rashmi.Swamy@ibm.com
-  name: rashmiswamyibm
-- email: Vineeth.Soman@ibm.com
-  name: vineethsoman03
+  - email: felix.marx@ibm.com
+    name: FelixMarxIBM
+  - email: fredrik.gundersen@ibm.com
+    name: FredrikAtIBM
+  - email: jefiyamj@ibm.com
+    name: Jefiya-MJ
+  - email: konrad.ohms@de.ibm.com
+    name: Konrad-Ohms
+  - email: Krishnapriya.RS@ibm.com
+    name: Krishnapriya-RS
+  - email: milica.cvrkota@ibm.com
+    name: Milica-Cvrkota-IBM
+  - email: Nagaraj.Kandoor@ibm.com
+    name: nagaraj-kandoor
+  - email: Rashmi.Swamy@ibm.com
+    name: rashmiswamyibm
+  - email: Vineeth.Soman@ibm.com
+    name: vineethsoman03
 name: instana-agent
 sources:
-- https://github.com/instana/helm-charts
-version: 2.0.32
+  - https://github.com/instana/helm-charts
+version: 2.0.33

instana-agent/templates/operator_deployment_instana-agent-controller-manager.yml

@@ -76,6 +76,10 @@ spec:
                       - ppc64le
                       - s390x
                       - arm64
+      {{- if and .Values.controllerManager .Values.controllerManager.pod .Values.controllerManager.pod.tolerations }}
+      tolerations:
+        {{- toYaml .Values.controllerManager.pod.tolerations | nindent 8 }}
+      {{- end }}
       containers:
         - args:
             - --leader-elect

instana-agent/values.yaml

@@ -318,10 +318,15 @@ controllerManager:
     #   - name: my_awesome_secret_instead
     # If you want no imagePullSecrets to be specified in the agent pod, you can just pass an empty array to agent.image.pullSecrets
     pullSecrets: []
-  # resources:
-  #   limits:
-  #     cpu: 200m
-  #     memory: 600Mi
-  #   requests:
-  #     cpu: 200m
-  #     memory: 200Mi
+    # resources:
+    #   limits:
+    #     cpu: 200m
+    #     memory: 600Mi
+    #   requests:
+    #     cpu: 200m
+    #     memory: 200Mi
+    # operator pod-level settings (parallels agent.pod.*)
+    pod:
+      # controllerManager.pod.tolerations are tolerations to influence operator pod assignment.
+      # https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+      tolerations: []