feat: integrate into e2e tests

Signed-off-by: Bence Csati <[email protected]>

Author: csatib02

.github/workflows/e2e.yaml

@@ -37,6 +37,10 @@ jobs:
             context: images/syslog-ng-reloader
             tags: syslog-ng-reloader:local
             output: syslog-ng-reloader.tar
+          - image: fluentd-drain-watch
+            context: images/fluentd-drain-watch
+            tags: fluentd-drain-watch:local
+            output: fluentd-drain-watch.tar
 
     steps:
       - name: Checkout
@@ -91,6 +95,7 @@ jobs:
           docker load --input /tmp/fluentd-full.tar
           docker load --input /tmp/config-reloader.tar
           docker load --input /tmp/syslog-ng-reloader.tar
+          docker load --input /tmp/fluentd-drain-watch.tar
           docker load --input /tmp/controller.tar
           docker image ls -a
 
@@ -149,6 +154,7 @@ jobs:
           docker load --input /tmp/fluentd-full.tar
           docker load --input /tmp/config-reloader.tar
           docker load --input /tmp/syslog-ng-reloader.tar
+          docker load --input /tmp/fluentd-drain-watch.tar
           docker load --input /tmp/controller.tar
           docker image ls -a
 

Makefile

@@ -232,6 +232,7 @@ test-e2e-nodeps:
 		LOGGING_OPERATOR_IMAGE="${OPERATOR_IMG}" \
 		CONFIG_RELOADER_IMAGE="${CONFIG_RELOADER_IMG}" \
 		SYSLOG_NG_RELOADER_IMAGE="${SYSLOG_NG_RELOADER_IMG}" \
+		FLUENTD_DRAIN_WATCH_IMAGE="${FLUENTD_DRAIN_WATCH_IMG}" \
 		FLUENTD_IMAGE="${FLUENTD_IMG}" \
 		KIND_PATH="$(KIND)" \
 		KIND_IMAGE="$(KIND_IMAGE)" \

e2e/common/helpers.go

@@ -34,12 +34,14 @@ import (
 )
 
 const (
-	FluentdImageRepo   = "fluentd-full"
-	FluentdImageTag    = "local"
-	ConfigReloaderRepo = "config-reloader"
-	ConfigReloaderTag  = "local"
-	SyslogNGReloaderRepo = "syslog-ng-reloader"
-	SyslogNGReloaderTag  = "local"
+	FluentdImageRepo      = "fluentd-full"
+	FluentdImageTag       = "local"
+	ConfigReloaderRepo    = "config-reloader"
+	ConfigReloaderTag     = "local"
+	SyslogNGReloaderRepo  = "syslog-ng-reloader"
+	SyslogNGReloaderTag   = "local"
+	FluentdDrainWatchRepo = "fluentd-drain-watch"
+	FluentdDrainWatchTag  = "local"
 )
 
 var sequence uint32

e2e/common/setup/loggingoperator.go

@@ -46,6 +46,11 @@ var (
 			repository: "syslogng-reload",
 			tag:        "local",
 		},
+		{
+			lookupEnv:  "FLUENTD_DRAIN_WATCH_IMAGE",
+			repository: "fluentd-drain-watch",
+			tag:        "local",
+		},
 		{
 			lookupEnv:  "FLUENTD_IMAGE",
 			repository: "fluentd-full",

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

@@ -124,6 +124,10 @@ func TestFluentdAggregator_detached_multiple_failure(t *testing.T) {
 					Replicas: 1,
 					Drain: v1beta1.FluentdDrainConfig{
 						Enabled: true,
+						Image: v1beta1.ImageSpec{
+							Repository: common.FluentdDrainWatchRepo,
+							Tag:        common.FluentdDrainWatchTag,
+						},
 					},
 				},
 				Workers: 2,
@@ -160,6 +164,10 @@ func TestFluentdAggregator_detached_multiple_failure(t *testing.T) {
 					Replicas: 1,
 					Drain: v1beta1.FluentdDrainConfig{
 						Enabled: true,
+						Image: v1beta1.ImageSpec{
+							Repository: common.FluentdDrainWatchRepo,
+							Tag:        common.FluentdDrainWatchTag,
+						},
 					},
 				},
 				Workers: 2,

e2e/fluentd-aggregator-detached/fluentd_aggregator_detached_test.go

@@ -127,6 +127,10 @@ func TestFluentdAggregator_detached_MultiWorker(t *testing.T) {
 					Replicas: 1,
 					Drain: v1beta1.FluentdDrainConfig{
 						Enabled: true,
+						Image: v1beta1.ImageSpec{
+							Repository: common.FluentdDrainWatchRepo,
+							Tag:        common.FluentdDrainWatchTag,
+						},
 					},
 				},
 				Workers: 2,
@@ -165,6 +169,10 @@ func TestFluentdAggregator_detached_MultiWorker(t *testing.T) {
 					Replicas: 1,
 					Drain: v1beta1.FluentdDrainConfig{
 						Enabled: true,
+						Image: v1beta1.ImageSpec{
+							Repository: common.FluentdDrainWatchRepo,
+							Tag:        common.FluentdDrainWatchTag,
+						},
 					},
 				},
 			},

e2e/fluentd-aggregator/fluentd_aggregator_test.go

@@ -119,6 +119,10 @@ func TestFluentdAggregator_MultiWorker(t *testing.T) {
 						Replicas: 1,
 						Drain: v1beta1.FluentdDrainConfig{
 							Enabled: true,
+							Image: v1beta1.ImageSpec{
+								Repository: common.FluentdDrainWatchRepo,
+								Tag:        common.FluentdDrainWatchTag,
+							},
 						},
 					},
 					Workers: 2,
@@ -298,6 +302,10 @@ func TestFluentdAggregator_ConfigChecks(t *testing.T) {
 						Replicas: 1,
 						Drain: v1beta1.FluentdDrainConfig{
 							Enabled: true,
+							Image: v1beta1.ImageSpec{
+								Repository: common.FluentdDrainWatchRepo,
+								Tag:        common.FluentdDrainWatchTag,
+							},
 						},
 					},
 					Workers: 1,

e2e/volumedrain/volumedrain_test.go

@@ -117,6 +117,10 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 						Replicas: 2,
 						Drain: v1beta1.FluentdDrainConfig{
 							Enabled: true,
+							Image: v1beta1.ImageSpec{
+								Repository: common.FluentdDrainWatchRepo,
+								Tag:        common.FluentdDrainWatchTag,
+							},
 						},
 					},
 				},
@@ -351,6 +355,10 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 						Drain: v1beta1.FluentdDrainConfig{
 							Enabled:      true,
 							DeleteVolume: true,
+							Image: v1beta1.ImageSpec{
+								Repository: common.FluentdDrainWatchRepo,
+								Tag:        common.FluentdDrainWatchTag,
+							},
 						},
 					},
 				},

hack/test.sh

@@ -20,7 +20,7 @@ function main()
 
 function load_images()
 {
-    local images=( "controller:local" "fluentd-full:local" "config-reloader:local" )
+    local images=( "controller:local" "fluentd-full:local" "config-reloader:local" "syslog-ng-reloader:local" "fluentd-drain-watch:local" )
     for image in ${images[@]}; do
         kind load docker-image "${image}"
     done