Skip to content

Commit 4c03158

Browse files
authored
Add support for WNP to Fluent Bit (K8s Event collector) (#758)
1 parent b486e4e commit 4c03158

File tree

4 files changed

+53
-108
lines changed

4 files changed

+53
-108
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# SAS Viya Monitoring for Kubernetes
22

3-
## unreleased
3+
## Unreleased
44
* **Logging**
5+
* [CHANGE] The Fluent Bit Deployment used for Kubernetes Event collection can now be integrated into the
6+
SAS Viya Workload node placement strategy.
7+
* [CHANGE] An obsolete configuration file related to the Event Router has been removed from the repo.
58
* [UPGRADE] OpenSearch and OpenSearch Dashboards upgraded from 2.19.1 to 2.19.2.
69
* [UPGRADE] OpenSearch Helm chart upgraded from 2.32.0 to 2.34.0.
710
* [UPGRADE] OpenSearch Dashboards Helm chart upgraded from 2.28.0 to 2.30.0

logging/bin/deploy_fluentbit_k8sevents_opensearch.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ fi
2121

2222
set -e
2323

24+
# Enable workload node placement?
25+
LOG_NODE_PLACEMENT_ENABLE=${LOG_NODE_PLACEMENT_ENABLE:-${NODE_PLACEMENT_ENABLE:-false}}
26+
27+
# Optional workload node placement support
28+
if [ "$LOG_NODE_PLACEMENT_ENABLE" == "true" ]; then
29+
log_verbose "Enabling Fluent Bit (K8s Event Collector) for workload node placement"
30+
wnpValuesFile="logging/node-placement/values-fluent-bit-events-wnp.yaml"
31+
else
32+
log_debug "Workload node placement support is disabled for Fluent Bit (K8s Event Collector)"
33+
wnpValuesFile="$TMP_DIR/empty.yaml"
34+
fi
35+
2436
#Fail if not using OpenSearch back-end
2537
require_opensearch
2638

@@ -99,6 +111,7 @@ helm $helmDebug upgrade --install --namespace "$LOG_NS" v4m-fb-events \
99111
$versionstring \
100112
--values "$imageKeysFile" \
101113
--values logging/fb/fluent-bit_helm_values_events.yaml \
114+
--values "$wnpValuesFile" \
102115
--values "$openshiftValuesFile" \
103116
--values "$FB_EVENTS_USER_YAML" \
104117
--set fullnameOverride=v4m-fb-events \

logging/node-placement/eventrouter-wnp.yaml

Lines changed: 0 additions & 107 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
tolerations:
2+
- key: "workload.sas.com/class"
3+
operator: "Equal"
4+
value: "stateless"
5+
effect: "NoSchedule"
6+
- key: "workload.sas.com/class"
7+
operator: "Equal"
8+
value: "stateful"
9+
effect: "NoSchedule"
10+
affinity:
11+
nodeAffinity:
12+
preferredDuringSchedulingIgnoredDuringExecution:
13+
- weight: 100
14+
preference:
15+
matchExpressions:
16+
- key: workload.sas.com/class
17+
operator: In
18+
values:
19+
- stateless
20+
- weight: 50
21+
preference:
22+
matchExpressions:
23+
- key: workload.sas.com/class
24+
operator: NotIn
25+
values:
26+
- compute
27+
- cas
28+
- stateful
29+
- connect
30+
requiredDuringSchedulingIgnoredDuringExecution:
31+
nodeSelectorTerms:
32+
- matchExpressions:
33+
- key: kubernetes.azure.com/mode
34+
operator: NotIn
35+
values:
36+
- system

0 commit comments

Comments
 (0)