Skip to content

Commit a454bfe

Browse files
authored
[release-1.35] remove obsolete downgrade kafkachannel cleanup (#3585)
* remove obsolete downgrade kafkachannel cleanup * cleanup
1 parent 8567924 commit a454bfe

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

test/upgrade/upgrade.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package upgrade
22

33
import (
4-
pkgupgrade "knative.dev/pkg/test/upgrade"
5-
"knative.dev/reconciler-test/pkg/environment"
6-
74
"github.com/openshift-knative/serverless-operator/test"
85
"github.com/openshift-knative/serverless-operator/test/upgrade/installation"
6+
pkgupgrade "knative.dev/pkg/test/upgrade"
97
)
108

119
func ServerlessUpgradeOperations(ctx *test.Context) []pkgupgrade.Operation {
@@ -18,14 +16,12 @@ func ServerlessUpgradeOperations(ctx *test.Context) []pkgupgrade.Operation {
1816
}
1917
}
2018

21-
func ServerlessDowngradeOperations(ctx *test.Context, glob environment.GlobalEnvironment) []pkgupgrade.Operation {
19+
func ServerlessDowngradeOperations(ctx *test.Context) []pkgupgrade.Operation {
2220
return []pkgupgrade.Operation{
2321
pkgupgrade.NewOperation("DowngradeServerless", func(c pkgupgrade.Context) {
2422
if err := installation.DowngradeServerless(ctx); err != nil {
2523
c.T.Error("Serverless downgrade failed:", err)
2624
}
27-
installation.CleanupChannelv2ConsumerGroups(c, glob)
28-
installation.CleanupChannelv2Deployments(c, glob)
2925
}),
3026
}
3127
}

test/upgrade/upgrade_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestServerlessUpgradePrePost(t *testing.T) {
7575
},
7676
Installations: pkgupgrade.Installations{
7777
UpgradeWith: upgrade.ServerlessUpgradeOperations(ctx),
78-
DowngradeWith: upgrade.ServerlessDowngradeOperations(ctx, global),
78+
DowngradeWith: upgrade.ServerlessDowngradeOperations(ctx),
7979
},
8080
}
8181
suite.Execute(pkgupgrade.Configuration{T: t})
@@ -97,7 +97,7 @@ func TestServerlessUpgradeContinual(t *testing.T) {
9797
},
9898
Installations: pkgupgrade.Installations{
9999
UpgradeWith: upgrade.ServerlessUpgradeOperations(ctx),
100-
DowngradeWith: upgrade.ServerlessDowngradeOperations(ctx, global),
100+
DowngradeWith: upgrade.ServerlessDowngradeOperations(ctx),
101101
},
102102
}
103103
suite.Execute(pkgupgrade.Configuration{T: t})

0 commit comments

Comments
 (0)