Skip to content

Commit 31b87f0

Browse files
csatib02csatib02
committed
feat: integrate into e2e tests
Signed-off-by: Bence Csati <[email protected]>
1 parent abe28ea commit 31b87f0

File tree

14 files changed

+136
-1
lines changed

14 files changed

+136
-1
lines changed

‎.github/workflows/e2e.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
context: images/fluentd-drain-watch
4242
tags: fluentd-drain-watch:local
4343
output: fluentd-drain-watch.tar
44+
- image: node-exporter
45+
context: images/node-exporter
46+
tags: node-exporter:local
47+
output: node-exporter.tar
4448

4549
steps:
4650
- name: Checkout
@@ -96,6 +100,7 @@ jobs:
96100
docker load --input /tmp/config-reloader.tar
97101
docker load --input /tmp/syslog-ng-reloader.tar
98102
docker load --input /tmp/fluentd-drain-watch.tar
103+
docker load --input /tmp/node-exporter.tar
99104
docker load --input /tmp/controller.tar
100105
docker image ls -a
101106
@@ -155,6 +160,7 @@ jobs:
155160
docker load --input /tmp/config-reloader.tar
156161
docker load --input /tmp/syslog-ng-reloader.tar
157162
docker load --input /tmp/fluentd-drain-watch.tar
163+
docker load --input /tmp/node-exporter.tar
158164
docker load --input /tmp/controller.tar
159165
docker image ls -a
160166

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ FLUENTD_IMG ?= fluentd-full:local
4545
CONFIG_RELOADER_IMG ?= config-reloader:local
4646
SYSLOG_NG_RELOADER_IMG ?= syslog-ng-reloader:local
4747
FLUENTD_DRAIN_WATCH_IMG ?= fluentd-drain-watch:local
48+
NODE_EXPORTER_IMG ?= node-exporter:local
4849
OPERATOR_IMG ?= controller:local
4950
OPERATOR_IMG_DEBUG ?= controller:debug
5051

@@ -116,6 +117,7 @@ docker-build-e2e-test: ## Build the coverage docker image
116117
${DOCKER} build -t ${CONFIG_RELOADER_IMG} images/config-reloader
117118
${DOCKER} build -t ${SYSLOG_NG_RELOADER_IMG} images/syslog-ng-reloader
118119
${DOCKER} build -t ${FLUENTD_DRAIN_WATCH_IMG} images/fluentd-drain-watch
120+
${DOCKER} build -t ${NODE_EXPORTER_IMG} images/node-exporter
119121
${DOCKER} build -t ${FLUENTD_IMG} --target full images/fluentd
120122

121123
.PHONY: docker-build-drain-watch

‎e2e/common/helpers.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ const (
4242
SyslogNGReloaderTag = "local"
4343
FluentdDrainWatchRepo = "fluentd-drain-watch"
4444
FluentdDrainWatchTag = "local"
45+
NodeExporterRepo = "node-exporter"
46+
NodeExporterTag = "local"
4547
)
4648

4749
var sequence uint32
@@ -124,6 +126,10 @@ func LoggingInfra(
124126
Tag: ConfigReloaderTag,
125127
},
126128
},
129+
BufferVolumeImage: v1beta1.ImageSpec{
130+
Repository: NodeExporterRepo,
131+
Tag: NodeExporterTag,
132+
},
127133
},
128134
}
129135
RequireNoError(t, c.Create(ctx, &agent))
@@ -147,6 +153,10 @@ func LoggingInfra(
147153
Repository: ConfigReloaderRepo,
148154
Tag: ConfigReloaderTag,
149155
},
156+
BufferVolumeImage: v1beta1.ImageSpec{
157+
Repository: NodeExporterRepo,
158+
Tag: NodeExporterTag,
159+
},
150160
DisablePvc: true,
151161
Resources: v12.ResourceRequirements{
152162
Requests: v12.ResourceList{
@@ -225,6 +235,10 @@ func LoggingTenant(
225235
Repository: ConfigReloaderRepo,
226236
Tag: ConfigReloaderTag,
227237
},
238+
BufferVolumeImage: v1beta1.ImageSpec{
239+
Repository: NodeExporterRepo,
240+
Tag: NodeExporterTag,
241+
},
228242
DisablePvc: true,
229243
Resources: v12.ResourceRequirements{
230244
Requests: v12.ResourceList{

‎e2e/common/setup/loggingoperator.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ var (
5151
repository: "fluentd-drain-watch",
5252
tag: "local",
5353
},
54+
{
55+
lookupEnv: "NODE_EXPORTER_IMAGE",
56+
repository: "node-exporter",
57+
tag: "local",
58+
},
5459
{
5560
lookupEnv: "FLUENTD_IMAGE",
5661
repository: "fluentd-full",

‎e2e/fluentd-aggregator-detached-multiple-failures/fluentd_aggregator_detached_multiple_failures_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ func TestFluentdAggregator_detached_multiple_failure(t *testing.T) {
9090
Tag: common.ConfigReloaderTag,
9191
},
9292
},
93+
BufferVolumeImage: v1beta1.ImageSpec{
94+
Repository: common.NodeExporterRepo,
95+
Tag: common.NodeExporterTag,
96+
},
9397
},
9498
},
9599
}
@@ -109,6 +113,10 @@ func TestFluentdAggregator_detached_multiple_failure(t *testing.T) {
109113
Repository: common.ConfigReloaderRepo,
110114
Tag: common.ConfigReloaderTag,
111115
},
116+
BufferVolumeImage: v1beta1.ImageSpec{
117+
Repository: common.NodeExporterRepo,
118+
Tag: common.NodeExporterTag,
119+
},
112120
Resources: corev1.ResourceRequirements{
113121
Limits: corev1.ResourceList{
114122
corev1.ResourceCPU: resource.MustParse("500m"),
@@ -149,6 +157,10 @@ func TestFluentdAggregator_detached_multiple_failure(t *testing.T) {
149157
Repository: common.ConfigReloaderRepo,
150158
Tag: common.ConfigReloaderTag,
151159
},
160+
BufferVolumeImage: v1beta1.ImageSpec{
161+
Repository: common.NodeExporterRepo,
162+
Tag: common.NodeExporterTag,
163+
},
152164
Resources: corev1.ResourceRequirements{
153165
Limits: corev1.ResourceList{
154166
corev1.ResourceCPU: resource.MustParse("500m"),

‎e2e/fluentd-aggregator-detached/fluentd_aggregator_detached_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ func TestFluentdAggregator_detached_MultiWorker(t *testing.T) {
9393
Tag: common.ConfigReloaderTag,
9494
},
9595
},
96+
BufferVolumeImage: v1beta1.ImageSpec{
97+
Repository: common.NodeExporterRepo,
98+
Tag: common.NodeExporterTag,
99+
},
96100
},
97101
},
98102
}
@@ -112,6 +116,10 @@ func TestFluentdAggregator_detached_MultiWorker(t *testing.T) {
112116
Repository: common.ConfigReloaderRepo,
113117
Tag: common.ConfigReloaderTag,
114118
},
119+
BufferVolumeImage: v1beta1.ImageSpec{
120+
Repository: common.NodeExporterRepo,
121+
Tag: common.NodeExporterTag,
122+
},
115123
Resources: corev1.ResourceRequirements{
116124
Limits: corev1.ResourceList{
117125
corev1.ResourceCPU: resource.MustParse("500m"),
@@ -154,6 +162,10 @@ func TestFluentdAggregator_detached_MultiWorker(t *testing.T) {
154162
Repository: common.ConfigReloaderRepo,
155163
Tag: common.ConfigReloaderTag,
156164
},
165+
BufferVolumeImage: v1beta1.ImageSpec{
166+
Repository: common.NodeExporterRepo,
167+
Tag: common.NodeExporterTag,
168+
},
157169
Resources: corev1.ResourceRequirements{
158170
Limits: corev1.ResourceList{
159171
corev1.ResourceCPU: resource.MustParse("500m"),

‎e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ func TestFluentdAggregator_NamespaceLabel(t *testing.T) {
102102
Tag: common.ConfigReloaderTag,
103103
},
104104
},
105+
BufferVolumeImage: v1beta1.ImageSpec{
106+
Repository: common.NodeExporterRepo,
107+
Tag: common.NodeExporterTag,
108+
},
105109
FilterKubernetes: v1beta1.FilterKubernetes{
106110
// Namespace labels enrichment is enabled by default starting with version 4.9
107111
// NamespaceLabels: "On",
@@ -116,6 +120,10 @@ func TestFluentdAggregator_NamespaceLabel(t *testing.T) {
116120
Repository: common.ConfigReloaderRepo,
117121
Tag: common.ConfigReloaderTag,
118122
},
123+
BufferVolumeImage: v1beta1.ImageSpec{
124+
Repository: common.NodeExporterRepo,
125+
Tag: common.NodeExporterTag,
126+
},
119127
Resources: corev1.ResourceRequirements{
120128
Limits: corev1.ResourceList{
121129
corev1.ResourceCPU: resource.MustParse("500m"),

‎e2e/fluentd-aggregator/fluentd_aggregator_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ func TestFluentdAggregator_MultiWorker(t *testing.T) {
9494
Tag: common.ConfigReloaderTag,
9595
},
9696
},
97+
BufferVolumeImage: v1beta1.ImageSpec{
98+
Repository: common.NodeExporterRepo,
99+
Tag: common.NodeExporterTag,
100+
},
97101
},
98102
FluentdSpec: &v1beta1.FluentdSpec{
99103
Image: v1beta1.ImageSpec{
@@ -104,6 +108,10 @@ func TestFluentdAggregator_MultiWorker(t *testing.T) {
104108
Repository: common.ConfigReloaderRepo,
105109
Tag: common.ConfigReloaderTag,
106110
},
111+
BufferVolumeImage: v1beta1.ImageSpec{
112+
Repository: common.NodeExporterRepo,
113+
Tag: common.NodeExporterTag,
114+
},
107115
Resources: corev1.ResourceRequirements{
108116
Limits: corev1.ResourceList{
109117
corev1.ResourceCPU: resource.MustParse("500m"),
@@ -277,6 +285,10 @@ func TestFluentdAggregator_ConfigChecks(t *testing.T) {
277285
Tag: common.ConfigReloaderTag,
278286
},
279287
},
288+
BufferVolumeImage: v1beta1.ImageSpec{
289+
Repository: common.NodeExporterRepo,
290+
Tag: common.NodeExporterTag,
291+
},
280292
},
281293
FluentdSpec: &v1beta1.FluentdSpec{
282294
Image: v1beta1.ImageSpec{
@@ -287,6 +299,10 @@ func TestFluentdAggregator_ConfigChecks(t *testing.T) {
287299
Repository: common.ConfigReloaderRepo,
288300
Tag: common.ConfigReloaderTag,
289301
},
302+
BufferVolumeImage: v1beta1.ImageSpec{
303+
Repository: common.NodeExporterRepo,
304+
Tag: common.NodeExporterTag,
305+
},
290306
Resources: corev1.ResourceRequirements{
291307
Limits: corev1.ResourceList{
292308
corev1.ResourceCPU: resource.MustParse("500m"),

‎e2e/logging_metrics_monitoring/logging_metrics_monitoring_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,20 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
139139
Tag: common.ConfigReloaderTag,
140140
},
141141
},
142+
BufferVolumeImage: v1beta1.ImageSpec{
143+
Repository: common.NodeExporterRepo,
144+
Tag: common.NodeExporterTag,
145+
},
142146
},
143147
SyslogNGSpec: &v1beta1.SyslogNGSpec{
144148
ConfigReloadImage: &v1beta1.BasicImageSpec{
145149
Repository: common.SyslogNGReloaderRepo,
146150
Tag: common.SyslogNGReloaderTag,
147151
},
152+
BufferVolumeMetricsImage: &v1beta1.BasicImageSpec{
153+
Repository: common.NodeExporterRepo,
154+
Tag: common.NodeExporterTag,
155+
},
148156
Metrics: &v1beta1.Metrics{
149157
ServiceMonitor: true,
150158
},
@@ -217,6 +225,10 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
217225
Tag: common.ConfigReloaderTag,
218226
},
219227
},
228+
BufferVolumeImage: v1beta1.ImageSpec{
229+
Repository: common.NodeExporterRepo,
230+
Tag: common.NodeExporterTag,
231+
},
220232
},
221233
FluentdSpec: &v1beta1.FluentdSpec{
222234
Image: v1beta1.ImageSpec{
@@ -227,6 +239,10 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
227239
Repository: common.ConfigReloaderRepo,
228240
Tag: common.ConfigReloaderTag,
229241
},
242+
BufferVolumeImage: v1beta1.ImageSpec{
243+
Repository: common.NodeExporterRepo,
244+
Tag: common.NodeExporterTag,
245+
},
230246
Metrics: &v1beta1.Metrics{
231247
ServiceMonitor: true,
232248
},

‎e2e/syslog-ng-aggregator-detached/syslog_ng_aggregator_detached_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ func TestSyslogNGDetachedIsRunningAndForwardingLogs(t *testing.T) {
9393
Tag: common.ConfigReloaderTag,
9494
},
9595
},
96+
BufferVolumeImage: v1beta1.ImageSpec{
97+
Repository: common.NodeExporterRepo,
98+
Tag: common.NodeExporterTag,
99+
},
96100
},
97101
},
98102
}
@@ -108,6 +112,10 @@ func TestSyslogNGDetachedIsRunningAndForwardingLogs(t *testing.T) {
108112
Repository: common.SyslogNGReloaderRepo,
109113
Tag: common.SyslogNGReloaderTag,
110114
},
115+
BufferVolumeMetricsImage: &v1beta1.BasicImageSpec{
116+
Repository: common.NodeExporterRepo,
117+
Tag: common.NodeExporterTag,
118+
},
111119
StatefulSetOverrides: &typeoverride.StatefulSet{
112120
Spec: typeoverride.StatefulSetSpec{
113121
Template: typeoverride.PodTemplateSpec{
@@ -165,6 +173,10 @@ func TestSyslogNGDetachedIsRunningAndForwardingLogs(t *testing.T) {
165173
Repository: common.SyslogNGReloaderRepo,
166174
Tag: common.SyslogNGReloaderTag,
167175
},
176+
BufferVolumeMetricsImage: &v1beta1.BasicImageSpec{
177+
Repository: common.NodeExporterRepo,
178+
Tag: common.NodeExporterTag,
179+
},
168180
StatefulSetOverrides: &typeoverride.StatefulSet{
169181
Spec: typeoverride.StatefulSetSpec{
170182
Template: typeoverride.PodTemplateSpec{

0 commit comments

Comments
 (0)