diff --git a/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml index 7194dfd..483148f 100644 --- a/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml @@ -155,6 +155,10 @@ metadata: "imagePullPolicy": "IfNotPresent" }, "configVersion": "v2.3.0", + "controller": { + "nodeSelector": null, + "tolerations": null + }, "dnsPolicy": "ClusterFirstWithHostNet", "forceUpdate": false, "fsGroupPolicy": "ReadWriteOnceWithFSType", @@ -168,6 +172,24 @@ metadata: "name": "X_CSI_TOPOLOGY_CONTROL_ENABLED", "value": "false" } + ], + "nodeSelector": null, + "tolerations": [ + { + "effect": "NoExecute", + "key": "node.kubernetes.io/memory-pressure", + "operator": "Exists" + }, + { + "effect": "NoExecute", + "key": "node.kubernetes.io/disk-pressure", + "operator": "Exists" + }, + { + "effect": "NoExecute", + "key": "node.kubernetes.io/network-unavailable", + "operator": "Exists" + } ] }, "replicas": 2 @@ -327,6 +349,11 @@ metadata: "imagePullPolicy": "IfNotPresent" }, "configVersion": "v2.3.0", + "controller": { + "envs": null, + "nodeSelector": null, + "tolerations": null + }, "dnsPolicy": "ClusterFirstWithHostNet", "forceUpdate": false, "fsGroupPolicy": "File", @@ -343,6 +370,11 @@ metadata: "name": "sdc" } ], + "node": { + "envs": null, + "nodeSelector": null, + "tolerations": null + }, "replicas": 1, "sideCars": [ { diff --git a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml index 02fdf7a..4c0db60 100644 --- a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml +++ b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml @@ -155,6 +155,10 @@ metadata: "imagePullPolicy": "IfNotPresent" }, "configVersion": "v2.3.0", + "controller": { + "nodeSelector": null, + "tolerations": null + }, "dnsPolicy": "ClusterFirstWithHostNet", "forceUpdate": false, "fsGroupPolicy": "ReadWriteOnceWithFSType", @@ -168,6 +172,24 @@ metadata: "name": "X_CSI_TOPOLOGY_CONTROL_ENABLED", "value": "false" } + ], + "nodeSelector": null, + "tolerations": [ + { + "effect": "NoExecute", + "key": "node.kubernetes.io/memory-pressure", + "operator": "Exists" + }, + { + "effect": "NoExecute", + "key": "node.kubernetes.io/disk-pressure", + "operator": "Exists" + }, + { + "effect": "NoExecute", + "key": "node.kubernetes.io/network-unavailable", + "operator": "Exists" + } ] }, "replicas": 2 @@ -327,6 +349,11 @@ metadata: "imagePullPolicy": "IfNotPresent" }, "configVersion": "v2.3.0", + "controller": { + "envs": null, + "nodeSelector": null, + "tolerations": null + }, "dnsPolicy": "ClusterFirstWithHostNet", "forceUpdate": false, "fsGroupPolicy": "File", @@ -343,6 +370,11 @@ metadata: "name": "sdc" } ], + "node": { + "envs": null, + "nodeSelector": null, + "tolerations": null + }, "replicas": 1, "sideCars": [ { diff --git a/config/samples/storage_v1_csiisilon.yaml b/config/samples/storage_v1_csiisilon.yaml index 09fc255..f05ed10 100644 --- a/config/samples/storage_v1_csiisilon.yaml +++ b/config/samples/storage_v1_csiisilon.yaml @@ -123,18 +123,23 @@ spec: # Leave as blank to consider all nodes # Allowed values: map of key-value pairs # Default value: None - # Examples: - # node-role.kubernetes.io/control-plane: "" nodeSelector: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint # node-role.kubernetes.io/control-plane: "" # tolerations: Define tolerations for the controller deployment, if required. # Default value: None + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint tolerations: - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Equal" - # value: "true" - # effect: "NoSchedule" + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" node: envs: @@ -170,6 +175,7 @@ spec: # tolerations: Define tolerations for the node daemonset, if required. # Default value: None + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint tolerations: # - key: "node.kubernetes.io/memory-pressure" # operator: "Exists" @@ -180,6 +186,13 @@ spec: # - key: "node.kubernetes.io/network-unavailable" # operator: "Exists" # effect: "NoExecute" + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" sideCars: - name: common diff --git a/config/samples/storage_v1_csipowermax.yaml b/config/samples/storage_v1_csipowermax.yaml index ae7d9d6..b62e2f2 100644 --- a/config/samples/storage_v1_csipowermax.yaml +++ b/config/samples/storage_v1_csipowermax.yaml @@ -74,7 +74,32 @@ spec: # default values: None - name: "X_CSI_GRPC_MAX_THREADS" value: "4" + controller: + # nodeSelector: Define node selection constraints for controller pods. + # For the pod to be eligible to run on a node, the node must have each + # of the indicated key-value pairs as labels. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + nodeSelector: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" + # tolerations: Define tolerations that would be applied to controller deployment + # Leave as blank to install controller on worker nodes + # Allowed values: map of key-value pairs + # Default value: None + tolerations: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" node: envs: # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the driver is going to configure @@ -95,3 +120,30 @@ spec: # Default value: false - name: X_CSI_TOPOLOGY_CONTROL_ENABLED value: "false" + # nodeSelector: Define node selection constraints for node pods. + # For the pod to be eligible to run on a node, the node must have each + # of the indicated key-value pairs as labels. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + nodeSelector: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" + + # tolerations: Define tolerations that would be applied to node daemonset + # Add/Remove tolerations as per requirement + # Leave as blank if you wish to not apply any tolerations + # Allowed values: map of key-value pairs + # Default value: None + tolerations: + - key: "node.kubernetes.io/memory-pressure" + operator: "Exists" + effect: "NoExecute" + - key: "node.kubernetes.io/disk-pressure" + operator: "Exists" + effect: "NoExecute" + - key: "node.kubernetes.io/network-unavailable" + operator: "Exists" + effect: "NoExecute" diff --git a/config/samples/storage_v1_csipowerstore.yaml b/config/samples/storage_v1_csipowerstore.yaml index 26d2734..d9531f7 100644 --- a/config/samples/storage_v1_csipowerstore.yaml +++ b/config/samples/storage_v1_csipowerstore.yaml @@ -58,11 +58,13 @@ spec: # Default value: None tolerations: # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # - key: "node-role.kubernetes.io/master" + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Exists" - # effect: "NoSchedule" + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" node: envs: # Set to "true" to enable ISCSI CHAP Authentication @@ -76,15 +78,21 @@ spec: # Leave as blank to consider all nodes # Allowed values: map of key-value pairs # Default value: None - # Examples: - # node-role.kubernetes.io/worker: "" nodeSelector: - # node-role.kubernetes.io/worker: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" # tolerations: Define tolerations for the controllers, if required. # Leave as blank to install controller on worker nodes # Default value: None tolerations: - # - key: "node-role.kubernetes.io/worker" - # operator: "Exists" - # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" diff --git a/config/samples/storage_v1_csiunity.yaml b/config/samples/storage_v1_csiunity.yaml index 8a917a7..2b8d72f 100644 --- a/config/samples/storage_v1_csiunity.yaml +++ b/config/samples/storage_v1_csiunity.yaml @@ -24,15 +24,21 @@ spec: # Leave as blank to consider all nodes # Allowed values: map of key-value pairs # Default value: None - # Examples: - # node-role.kubernetes.io/control-plane: "" nodeSelector: - # node-role.kubernetes.io/control-plane: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" # tolerations: Define tolerations for the controllers, if required. # Leave as blank to install controller on worker nodes # Default value: None tolerations: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" @@ -44,14 +50,23 @@ spec: # Leave as blank to consider all nodes # Allowed values: map of key-value pairs # Default value: None - # Examples: - # node-role.kubernetes.io/control-plane: "" nodeSelector: - # node-role.kubernetes.io/control-plane: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" # tolerations: Define tolerations for the node daemonset, if required. # Default value: None tolerations: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" # - key: "node.kubernetes.io/memory-pressure" # operator: "Exists" # effect: "NoExecute" diff --git a/config/samples/storage_v1_csivxflexos.yaml b/config/samples/storage_v1_csivxflexos.yaml index f13d939..30b75b9 100644 --- a/config/samples/storage_v1_csivxflexos.yaml +++ b/config/samples/storage_v1_csivxflexos.yaml @@ -30,6 +30,58 @@ spec: value: "1" - name: MDM value: "" + + controller: + envs: + + #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment + # Leave as blank to use all nodes + # Allowed values: map of key-value pairs + # Default value: None + nodeSelector: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" + + # "controller.tolerations" defines tolerations that would be applied to controller deployment + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" + + node: + envs: + + # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset + # Leave as blank to use all nodes + # Allowed values: map of key-value pairs + # Default value: None + nodeSelector: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # node-role.kubernetes.io/control-plane: "" + + # "node.tolerations" defines tolerations that would be applied to node daemonset + # Leave as blank to install node driver only on worker nodes + # Default value: None + tolerations: + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # - key: "node-role.kubernetes.io/control-plane" + # operator: "Exists" + # effect: "NoSchedule" initContainers: - image: dellemc/sdc:3.6