Skip to content

Commit

Permalink
permit specifying trident-operator resources
Browse files Browse the repository at this point in the history
closes NetApp#927

Signed-off-by: Clément Nussbaumer <[email protected]>
  • Loading branch information
clementnuss committed Sep 27, 2024
1 parent e648ed2 commit 1e9b459
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
9 changes: 2 additions & 7 deletions helm/trident-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
spec:
{{- if .Values.affinity }}
affinity:
{{- toYaml .Values.affinity | nindent 8 }}
{{- toYaml .Values.affinity | nindent 8 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
Expand Down Expand Up @@ -68,12 +68,7 @@ spec:
imagePullPolicy: {{ .Values.imagePullPolicy }}
name: trident-operator
resources:
requests:
cpu: "10m"
memory: "40Mi"
limits:
cpu: "20m"
memory: "80Mi"
{{- toYaml .Values.operatorResources | nindent 10 }}
{{- if and (eq .Values.cloudProvider "Azure") (eq .Values.cloudIdentity "") }}
volumes:
- name: azure-cred
Expand Down
17 changes: 13 additions & 4 deletions helm/trident-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ affinity:
operator: In
values:
- linux


# tridentControllerPluginNodeSelector additional nodeSelectors for the Pod running the Trident Controller CSI Plugin.
# tridentControllerPluginNodeSelector : {}
Expand All @@ -43,7 +43,7 @@ affinity:
# tridentNodePluginNodeSelector additional nodeSelectors for Pods running the Trident Node CSI Plugin.
# tridentNodePluginNodeSelector : {}

# tridentNodePluginTolerations overrides tolerations for Pods running the Trident Node CSI Plugin.
# tridentNodePluginTolerations overrides tolerations for Pods running the Trident Node CSI Plugin.
# tridentNodePluginTolerations: []


Expand All @@ -61,7 +61,7 @@ imagePullSecrets: []
kubeletDir: ""


# operatorLogLevel allows the log level of the Trident operator to be set to one of these:
# operatorLogLevel allows the log level of the Trident operator to be set to one of these:
# trace, debug, info, warn, error, fatal.
# operatorLogLevel: "info"

Expand All @@ -74,6 +74,15 @@ operatorImage: ""
# operatorImageTag allows overriding the tag of the trident-operator image.
operatorImageTag: ""

# operatorResources permits configuring the trident-operator resources.
operatorResources:
requests:
cpu: "10m"
memory: "40Mi"
limits:
cpu: "20m"
memory: "80Mi"


# tridentIPv6 allows enabling Trident to work in IPv6 clusters.
tridentIPv6: false
Expand Down Expand Up @@ -164,7 +173,7 @@ iscsiSelfHealingWaitTime: "7m0s"
configuratorReconcileInterval: 30m0s

# forceInstallRancherClusterRoles will install a Rancher specific ClusterRole and ClusterRoleBinding when set to true.
# When set to false, the ClusterRole and ClusterRoleBinding will be installed only when a Rancher cluster is detected.
# When set to false, the ClusterRole and ClusterRoleBinding will be installed only when a Rancher cluster is detected.
forceInstallRancherClusterRoles: false

# Auto generated ANF backend related fields consumed by the configurator controller.
Expand Down

0 comments on commit 1e9b459

Please sign in to comment.