Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions ansible/playbooks/tasks/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,45 @@
enabled: true
serviceMonitor:
enabled: false
# Keep the chart's default required podAffinity to a local cilium
affinity:
podAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- topologyKey: kubernetes.io/hostname
labelSelector:
matchLabels:
k8s-app: cilium
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
ui:
enabled: true
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
backend:
resources:
limits:
Expand Down Expand Up @@ -156,6 +193,41 @@
requests:
cpu: "2"
memory: "512Mi"
# Keep the chart's default required podAntiAffinity (spreads the 3
# replicas across 3 different nodes for HA -- only one is ever the
# elected leader) and add a soft preference for metal-01 alongside
# it, so at most one of the 3 replicas can land there.
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- topologyKey: kubernetes.io/hostname
labelSelector:
matchLabels:
io.cilium/app: operator
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
# Preserve the chart's default tolerations (control-plane, master,
# not-ready, uninitialized) alongside our own.
tolerations:
- key: "node-role.kubernetes.io/control-plane"
operator: Exists
- key: "node-role.kubernetes.io/master"
operator: Exists
- key: "node.kubernetes.io/not-ready"
operator: Exists
- key: "node.cloudprovider.kubernetes.io/uninitialized"
operator: Exists
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"

# Cilium agent resources
resources:
Expand Down
30 changes: 28 additions & 2 deletions ansible/playbooks/tasks/rancher_fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,27 @@
values:
crds:
enabled: true
tolerations: &cert_manager_tolerations
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
affinity: &cert_manager_affinity
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
webhook:
tolerations: *cert_manager_tolerations
affinity: *cert_manager_affinity
cainjector:
tolerations: *cert_manager_tolerations
affinity: *cert_manager_affinity

- name: Wait for cert-manager to be ready
command: kubectl wait --for=condition=ready pod -l app.kubernetes.io/instance=cert-manager -n cert-manager --timeout=300s
Expand Down Expand Up @@ -152,9 +173,14 @@
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
# Rancher's chart only supports hard (requiredDuringScheduling) node
# affinity -- there is no soft/preferred option in this chart
# anywhere else until this is reverted.
extraNodeSelectorTerms:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
ingress:
enabled: true
tls:
Expand Down
6 changes: 4 additions & 2 deletions fleet/authentik-config/outpost.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ spec:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/worker
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand Down
20 changes: 15 additions & 5 deletions fleet/authentik-token-sync/token-sync-initial-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,21 @@ spec:
ttlSecondsAfterFinished: 3600
template:
spec:
#tolerations:
# - key: "dedicated"
# operator: "Equal"
# value: "monitoring"
# effect: "PreferNoSchedule"
tolerations:
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
serviceAccountName: authentik-outpost-token-sync
restartPolicy: OnFailure
initContainers:
Expand Down
22 changes: 16 additions & 6 deletions fleet/authentik-token-sync/token-sync-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,28 @@ metadata:
name: authentik-outpost-token-sync
namespace: authentik
spec:
schedule: "*/2 * * * *" # Every 2 minutes
schedule: "*/10 * * * *" # Every 10 minutes (token rotates ~hourly)
successfulJobsHistoryLimit: 1
failedJobsHistoryLimit: 1
jobTemplate:
spec:
template:
spec:
#tolerations:
# - key: "dedicated"
# operator: "Equal"
# value: "monitoring"
# effect: "PreferNoSchedule"
tolerations:
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
serviceAccountName: authentik-outpost-token-sync
restartPolicy: OnFailure
initContainers:
Expand Down
22 changes: 14 additions & 8 deletions fleet/authentik/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ helm:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand Down Expand Up @@ -170,8 +172,10 @@ helm:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand All @@ -182,7 +186,7 @@ helm:
effect: "NoSchedule"
resources:
requests:
cpu: "4"
cpu: "2"
memory: "4Gi"
limits:
cpu: "8"
Expand Down Expand Up @@ -216,8 +220,10 @@ helm:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand All @@ -228,7 +234,7 @@ helm:
effect: "NoSchedule"
resources:
requests:
cpu: "2"
cpu: "1"
memory: "2Gi"
limits:
cpu: "4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ helm:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,21 @@ helm:
cpu: 1
memory: 500Mi
nodeSelector: {}
affinity: {}
tolerations: []
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"

controller:
name: vaclab-scheduler-controller
Expand All @@ -49,8 +62,10 @@ helm:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand Down
2 changes: 1 addition & 1 deletion fleet/dst-dashboard/backend/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
resources:
requests:
memory: "4Gi"
cpu: "4"
cpu: "1"
limits:
memory: "16Gi"
cpu: "8"
Expand Down
2 changes: 1 addition & 1 deletion fleet/grafana-tempo-external/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ helm:
retention: 4380h # 6 months
resources:
requests:
cpu: "2"
cpu: "500m"
memory: 4Gi
limits:
cpu: "2"
Expand Down
2 changes: 1 addition & 1 deletion fleet/grafana-tempo/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ helm:
retention: 4380h # 6 months
resources:
requests:
cpu: "2"
cpu: "500m"
memory: 4Gi
limits:
cpu: "2"
Expand Down
8 changes: 5 additions & 3 deletions fleet/homepage/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ spec:
- weight: 100
preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
Expand Down Expand Up @@ -61,7 +63,7 @@ spec:
- ALL
resources:
requests:
cpu: "4"
cpu: "250m"
memory: "2Gi"
limits:
cpu: "8"
Expand Down
18 changes: 18 additions & 0 deletions fleet/kyverno-reporter-ui/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@ helm:
releaseName: policy-reporter
takeOwnership: true
values:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- metal-01.he-eu-hel1.misc.vacdst
tolerations:
- key: "dedicated"
operator: "Equal"
value: "monitoring"
effect: "PreferNoSchedule"
- key: "node-role.kubernetes.io/control-plane"
operator: "Exists"
effect: "NoSchedule"
ui:
enabled: true
affinity:
Expand Down
Loading
Loading