icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add tolerations and affinity rules for devops node role in Argo CD and Jenkins, and update resource requests and limits for RabbitMQ

Browse Source 
Signed-off-by: zhenyus <zhenyus@mathmast.com>
This commit is contained in:
zhenyus 2025-03-08 21:36:53 +08:00
parent 3f2c07c0e1
commit 98a13e4b04
3 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cluster/manifests/freeleaps-devops-system/argo-cd/values.yaml
View File

@ -1223,11 +1223,23 @@ repoServer:
# -- [Tolerations] for use with node taints # -- [Tolerations] for use with node taints
# @default -- `[]` (defaults to global.tolerations) # @default -- `[]` (defaults to global.tolerations)
tolerations: [] tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/devops
value: "true"
operator: Equal
# -- Assign custom [affinity] rules to the deployment # -- Assign custom [affinity] rules to the deployment
# @default -- `{}` (defaults to global.affinity preset) # @default -- `{}` (defaults to global.affinity preset)
affinity: {} affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/devops
operator: In
values:
- "true"
# -- Assign custom [TopologySpreadConstraints] rules to the repo server # -- Assign custom [TopologySpreadConstraints] rules to the repo server
# @default -- `[]` (defaults to global.topologySpreadConstraints) # @default -- `[]` (defaults to global.topologySpreadConstraints)
@ -1596,11 +1608,23 @@ applicationSet:
# -- [Tolerations] for use with node taints # -- [Tolerations] for use with node taints
# @default -- `[]` (defaults to global.tolerations) # @default -- `[]` (defaults to global.tolerations)
tolerations: [] tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/devops
value: "true"
operator: Equal
# -- Assign custom [affinity] rules # -- Assign custom [affinity] rules
# @default -- `{}` (defaults to global.affinity preset) # @default -- `{}` (defaults to global.affinity preset)
affinity: {} affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/devops
operator: In
values:
- "true"
# -- Assign custom [TopologySpreadConstraints] rules to the ApplicationSet controller # -- Assign custom [TopologySpreadConstraints] rules to the ApplicationSet controller
# @default -- `[]` (defaults to global.topologySpreadConstraints) # @default -- `[]` (defaults to global.topologySpreadConstraints)
@ -1976,11 +2000,23 @@ notifications:
# -- [Tolerations] for use with node taints # -- [Tolerations] for use with node taints
# @default -- `[]` (defaults to global.tolerations) # @default -- `[]` (defaults to global.tolerations)
tolerations: [] tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/devops
value: "true"
operator: Equal
# -- Assign custom [affinity] rules # -- Assign custom [affinity] rules
# @default -- `{}` (defaults to global.affinity preset) # @default -- `{}` (defaults to global.affinity preset)
affinity: {} affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/devops
operator: In
values:
- "true"
# -- Assign custom [TopologySpreadConstraints] rules to the application controller # -- Assign custom [TopologySpreadConstraints] rules to the application controller
# @default -- `[]` (defaults to global.topologySpreadConstraints) # @default -- `[]` (defaults to global.topologySpreadConstraints)

16
cluster/manifests/freeleaps-devops-system/jenkins/values.yaml
View File

@ -660,7 +660,11 @@ controller:
# ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
# -- Toleration labels for pod assignment # -- Toleration labels for pod assignment
tolerations: [] tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/devops
value: "true"
operator: Equal
# -- Set TerminationGracePeriodSeconds # -- Set TerminationGracePeriodSeconds
terminationGracePeriodSeconds: terminationGracePeriodSeconds:
# -- Set the termination message path # -- Set the termination message path
@ -669,7 +673,15 @@ controller:
terminationMessagePolicy: terminationMessagePolicy:
# -- Affinity settings # -- Affinity settings
affinity: {} affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/devops
operator: In
values:
- "true"
# Leverage a priorityClass to ensure your pods survive resource shortages # Leverage a priorityClass to ensure your pods survive resource shortages
# ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/

7
freeleaps/helm-pkg/3rd/rabbitmq/values.alpha.yaml
View File

@ -12,6 +12,13 @@ image:
namespaceOverride: "freeleaps-alpha" namespaceOverride: "freeleaps-alpha"
clusterDomain: freeleaps.cluster clusterDomain: freeleaps.cluster
automountServiceAccountToken: true automountServiceAccountToken: true
resources:
requests:
cpu: 100m
memory: 256Mi
limits:
cpu: 300m
memory: 512Mi
auth: auth:
username: user username: user
password: "" password: ""