Skip to content

Commit 9a7a1a5

Browse files
authored
Merge pull request #2294 from vyncint/fix-e2e-dead-code
refactor(e2e): remove dead code and correct the syslog-ng reloader image name
2 parents 4feaa43 + 81a31e3 commit 9a7a1a5

2 files changed

Lines changed: 1 addition & 170 deletions

File tree

e2e/common/panicobject.go

Lines changed: 0 additions & 164 deletions
This file was deleted.

e2e/common/setup/loggingoperator.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"os"
2020
"strings"
2121
"testing"
22-
"time"
2322

2423
"helm.sh/helm/v3/pkg/action"
2524
"helm.sh/helm/v3/pkg/chart/loader"
@@ -42,7 +41,7 @@ var defaultImages = []e2eImage{
4241
},
4342
{
4443
lookupEnv: "SYSLOG_NG_RELOADER_IMAGE",
45-
repository: "syslogng-reload",
44+
repository: "syslog-ng-reloader",
4645
tag: "local",
4746
},
4847
{
@@ -76,8 +75,6 @@ func LoggingOperator(t *testing.T, c common.Cluster, opts ...LoggingOperatorOpti
7675
opt := &LoggingOperatorOptions{
7776
Namespace: "default",
7877
NameOverride: "logging-operator",
79-
PollInterval: time.Second * 3,
80-
Timeout: time.Minute,
8178
}
8279

8380
for _, o := range opts {
@@ -191,7 +188,5 @@ func (fn LoggingOperatorOptionFunc) ApplyToLoggingOperatorOptions(options *Loggi
191188
type LoggingOperatorOptions struct {
192189
Namespace string
193190
NameOverride string
194-
PollInterval time.Duration
195-
Timeout time.Duration
196191
Args []string
197192
}

0 commit comments

Comments
 (0)