Skip to content

Commit

Permalink
Merge pull request #230 from openshift-cherrypick-robot/cherry-pick-2…
Browse files Browse the repository at this point in the history
…28-to-release-4.16

Bug 2312055: [release-4.16] bundle: add default toleration to operators and cronjob
  • Loading branch information
openshift-merge-bot[bot] authored Sep 25, 2024
2 parents b2ca526 + efdc27f commit 5ea0a64
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
5 changes: 5 additions & 0 deletions config/console/console_init.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,8 @@ spec:
securityContext:
runAsNonRoot: true
serviceAccountName: ocs-client-operator-controller-manager
tolerations:
- effect: NoSchedule
key: node.ocs.openshift.io/storage
operator: Equal
value: "true"
5 changes: 5 additions & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,8 @@ spec:
secretName: webhook-cert-secret
serviceAccountName: controller-manager
terminationGracePeriodSeconds: 10
tolerations:
- effect: NoSchedule
key: node.ocs.openshift.io/storage
operator: Equal
value: "true"
8 changes: 8 additions & 0 deletions controllers/storageclient_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,14 @@ func (r *StorageClientReconciler) reconcileClientStatusReporterJob() (reconcile.
},
RestartPolicy: corev1.RestartPolicyOnFailure,
ServiceAccountName: "ocs-client-operator-status-reporter",
Tolerations: []corev1.Toleration{
{
Effect: corev1.TaintEffectNoSchedule,
Key: "node.ocs.openshift.io/storage",
Operator: corev1.TolerationOpEqual,
Value: "true",
},
},
},
},
},
Expand Down

0 comments on commit 5ea0a64

Please sign in to comment.